From 97adf4f97cc5f84911985a5878e2c95a03cc2601 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Fri, 15 Sep 2017 14:26:56 +0200 Subject: [PATCH] build(submodules): Remove submodules + move everything at root --- .gitmodules | 12 ------------ .../es_extended/__resource.lua => __resource.lua | 0 .../es_extended/client => client}/common.lua | 0 .../es_extended/client => client}/entityiter.lua | 0 .../es_extended/client => client}/functions.lua | 0 .../es_extended/client => client}/main.lua | 0 .../es_extended/config.lua => config.lua | 0 .../config.weapons.lua => config.weapons.lua | 0 .../es_extended/html => html}/css/app.css | 0 .../es_extended/html => html}/fonts/bankgothic.ttf | Bin .../es_extended/html => html}/fonts/pdown.ttf | Bin .../es_extended/html => html}/img/accounts/bank.png | Bin .../html => html}/img/accounts/black_money.png | Bin .../es_extended/html => html}/img/cursor.png | Bin .../es_extended/html => html}/img/keys/enter.png | Bin .../es_extended/html => html}/img/keys/return.png | Bin .../[essential]/es_extended/html => html}/js/app.js | 0 .../es_extended/html => html}/js/mustache.min.js | 0 .../[essential]/es_extended/html => html}/ui.html | 0 .../es_extended/locale.lua => locale.lua | 0 .../es_extended/locales => locales}/br.lua | 0 .../es_extended/locales => locales}/de.lua | 0 .../es_extended/locales => locales}/en.lua | 0 .../es_extended/locales => locales}/fr.lua | 0 resources/[esx]/[ui]/esx_menu_default | 1 - resources/[esx]/[ui]/esx_menu_dialog | 1 - resources/[esx]/[ui]/esx_menu_list | 1 - resources/async | 1 - .../server => server}/classes/player.lua | 0 .../es_extended/server => server}/commands.lua | 0 .../es_extended/server => server}/common.lua | 0 .../es_extended/server => server}/functions.lua | 0 .../es_extended/server => server}/main.lua | 0 .../es_extended/server => server}/paycheck.lua | 0 34 files changed, 16 deletions(-) delete mode 100644 .gitmodules rename resources/[essential]/es_extended/__resource.lua => __resource.lua (100%) rename {resources/[essential]/es_extended/client => client}/common.lua (100%) rename {resources/[essential]/es_extended/client => client}/entityiter.lua (100%) rename {resources/[essential]/es_extended/client => client}/functions.lua (100%) rename {resources/[essential]/es_extended/client => client}/main.lua (100%) rename resources/[essential]/es_extended/config.lua => config.lua (100%) rename resources/[essential]/es_extended/config.weapons.lua => config.weapons.lua (100%) rename {resources/[essential]/es_extended/html => html}/css/app.css (100%) rename {resources/[essential]/es_extended/html => html}/fonts/bankgothic.ttf (100%) rename {resources/[essential]/es_extended/html => html}/fonts/pdown.ttf (100%) rename {resources/[essential]/es_extended/html => html}/img/accounts/bank.png (100%) rename {resources/[essential]/es_extended/html => html}/img/accounts/black_money.png (100%) rename {resources/[essential]/es_extended/html => html}/img/cursor.png (100%) rename {resources/[essential]/es_extended/html => html}/img/keys/enter.png (100%) rename {resources/[essential]/es_extended/html => html}/img/keys/return.png (100%) rename {resources/[essential]/es_extended/html => html}/js/app.js (100%) rename {resources/[essential]/es_extended/html => html}/js/mustache.min.js (100%) rename {resources/[essential]/es_extended/html => html}/ui.html (100%) rename resources/[essential]/es_extended/locale.lua => locale.lua (100%) rename {resources/[essential]/es_extended/locales => locales}/br.lua (100%) rename {resources/[essential]/es_extended/locales => locales}/de.lua (100%) rename {resources/[essential]/es_extended/locales => locales}/en.lua (100%) rename {resources/[essential]/es_extended/locales => locales}/fr.lua (100%) delete mode 160000 resources/[esx]/[ui]/esx_menu_default delete mode 160000 resources/[esx]/[ui]/esx_menu_dialog delete mode 160000 resources/[esx]/[ui]/esx_menu_list delete mode 160000 resources/async rename {resources/[essential]/es_extended/server => server}/classes/player.lua (100%) rename {resources/[essential]/es_extended/server => server}/commands.lua (100%) rename {resources/[essential]/es_extended/server => server}/common.lua (100%) rename {resources/[essential]/es_extended/server => server}/functions.lua (100%) rename {resources/[essential]/es_extended/server => server}/main.lua (100%) rename {resources/[essential]/es_extended/server => server}/paycheck.lua (100%) diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index b58eb350..00000000 --- a/.gitmodules +++ /dev/null @@ -1,12 +0,0 @@ -[submodule "resources/[esx]/[ui]/fxserver-esx_menu_default"] - path = resources/[esx]/[ui]/esx_menu_default - url = https://github.com/FXServer-ESX/fxserver-esx_menu_default -[submodule "resources/[esx]/[ui]/fxserver-esx_menu_list"] - path = resources/[esx]/[ui]/esx_menu_list - url = https://github.com/FXServer-ESX/fxserver-esx_menu_list -[submodule "resources/[esx]/[ui]/fxserver-esx_menu_dialog"] - path = resources/[esx]/[ui]/esx_menu_dialog - url = https://github.com/FXServer-ESX/fxserver-esx_menu_dialog -[submodule "resources/fxserver-async"] - path = resources/async - url = https://github.com/FXServer-ESX/fxserver-async diff --git a/resources/[essential]/es_extended/__resource.lua b/__resource.lua similarity index 100% rename from resources/[essential]/es_extended/__resource.lua rename to __resource.lua diff --git a/resources/[essential]/es_extended/client/common.lua b/client/common.lua similarity index 100% rename from resources/[essential]/es_extended/client/common.lua rename to client/common.lua diff --git a/resources/[essential]/es_extended/client/entityiter.lua b/client/entityiter.lua similarity index 100% rename from resources/[essential]/es_extended/client/entityiter.lua rename to client/entityiter.lua diff --git a/resources/[essential]/es_extended/client/functions.lua b/client/functions.lua similarity index 100% rename from resources/[essential]/es_extended/client/functions.lua rename to client/functions.lua diff --git a/resources/[essential]/es_extended/client/main.lua b/client/main.lua similarity index 100% rename from resources/[essential]/es_extended/client/main.lua rename to client/main.lua diff --git a/resources/[essential]/es_extended/config.lua b/config.lua similarity index 100% rename from resources/[essential]/es_extended/config.lua rename to config.lua diff --git a/resources/[essential]/es_extended/config.weapons.lua b/config.weapons.lua similarity index 100% rename from resources/[essential]/es_extended/config.weapons.lua rename to config.weapons.lua diff --git a/resources/[essential]/es_extended/html/css/app.css b/html/css/app.css similarity index 100% rename from resources/[essential]/es_extended/html/css/app.css rename to html/css/app.css diff --git a/resources/[essential]/es_extended/html/fonts/bankgothic.ttf b/html/fonts/bankgothic.ttf similarity index 100% rename from resources/[essential]/es_extended/html/fonts/bankgothic.ttf rename to html/fonts/bankgothic.ttf diff --git a/resources/[essential]/es_extended/html/fonts/pdown.ttf b/html/fonts/pdown.ttf similarity index 100% rename from resources/[essential]/es_extended/html/fonts/pdown.ttf rename to html/fonts/pdown.ttf diff --git a/resources/[essential]/es_extended/html/img/accounts/bank.png b/html/img/accounts/bank.png similarity index 100% rename from resources/[essential]/es_extended/html/img/accounts/bank.png rename to html/img/accounts/bank.png diff --git a/resources/[essential]/es_extended/html/img/accounts/black_money.png b/html/img/accounts/black_money.png similarity index 100% rename from resources/[essential]/es_extended/html/img/accounts/black_money.png rename to html/img/accounts/black_money.png diff --git a/resources/[essential]/es_extended/html/img/cursor.png b/html/img/cursor.png similarity index 100% rename from resources/[essential]/es_extended/html/img/cursor.png rename to html/img/cursor.png diff --git a/resources/[essential]/es_extended/html/img/keys/enter.png b/html/img/keys/enter.png similarity index 100% rename from resources/[essential]/es_extended/html/img/keys/enter.png rename to html/img/keys/enter.png diff --git a/resources/[essential]/es_extended/html/img/keys/return.png b/html/img/keys/return.png similarity index 100% rename from resources/[essential]/es_extended/html/img/keys/return.png rename to html/img/keys/return.png diff --git a/resources/[essential]/es_extended/html/js/app.js b/html/js/app.js similarity index 100% rename from resources/[essential]/es_extended/html/js/app.js rename to html/js/app.js diff --git a/resources/[essential]/es_extended/html/js/mustache.min.js b/html/js/mustache.min.js similarity index 100% rename from resources/[essential]/es_extended/html/js/mustache.min.js rename to html/js/mustache.min.js diff --git a/resources/[essential]/es_extended/html/ui.html b/html/ui.html similarity index 100% rename from resources/[essential]/es_extended/html/ui.html rename to html/ui.html diff --git a/resources/[essential]/es_extended/locale.lua b/locale.lua similarity index 100% rename from resources/[essential]/es_extended/locale.lua rename to locale.lua diff --git a/resources/[essential]/es_extended/locales/br.lua b/locales/br.lua similarity index 100% rename from resources/[essential]/es_extended/locales/br.lua rename to locales/br.lua diff --git a/resources/[essential]/es_extended/locales/de.lua b/locales/de.lua similarity index 100% rename from resources/[essential]/es_extended/locales/de.lua rename to locales/de.lua diff --git a/resources/[essential]/es_extended/locales/en.lua b/locales/en.lua similarity index 100% rename from resources/[essential]/es_extended/locales/en.lua rename to locales/en.lua diff --git a/resources/[essential]/es_extended/locales/fr.lua b/locales/fr.lua similarity index 100% rename from resources/[essential]/es_extended/locales/fr.lua rename to locales/fr.lua diff --git a/resources/[esx]/[ui]/esx_menu_default b/resources/[esx]/[ui]/esx_menu_default deleted file mode 160000 index 4b1eae7a..00000000 --- a/resources/[esx]/[ui]/esx_menu_default +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4b1eae7a25cbb5ff496c3471dc0560487284a46e diff --git a/resources/[esx]/[ui]/esx_menu_dialog b/resources/[esx]/[ui]/esx_menu_dialog deleted file mode 160000 index 21c1051a..00000000 --- a/resources/[esx]/[ui]/esx_menu_dialog +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 21c1051a39184aa970528d8a435167860a092147 diff --git a/resources/[esx]/[ui]/esx_menu_list b/resources/[esx]/[ui]/esx_menu_list deleted file mode 160000 index b96205cd..00000000 --- a/resources/[esx]/[ui]/esx_menu_list +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b96205cdf6f8350a8600a983660eb007eb4375ce diff --git a/resources/async b/resources/async deleted file mode 160000 index 1ced6286..00000000 --- a/resources/async +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1ced6286328b04dc0d5466da1c559116b0a1f421 diff --git a/resources/[essential]/es_extended/server/classes/player.lua b/server/classes/player.lua similarity index 100% rename from resources/[essential]/es_extended/server/classes/player.lua rename to server/classes/player.lua diff --git a/resources/[essential]/es_extended/server/commands.lua b/server/commands.lua similarity index 100% rename from resources/[essential]/es_extended/server/commands.lua rename to server/commands.lua diff --git a/resources/[essential]/es_extended/server/common.lua b/server/common.lua similarity index 100% rename from resources/[essential]/es_extended/server/common.lua rename to server/common.lua diff --git a/resources/[essential]/es_extended/server/functions.lua b/server/functions.lua similarity index 100% rename from resources/[essential]/es_extended/server/functions.lua rename to server/functions.lua diff --git a/resources/[essential]/es_extended/server/main.lua b/server/main.lua similarity index 100% rename from resources/[essential]/es_extended/server/main.lua rename to server/main.lua diff --git a/resources/[essential]/es_extended/server/paycheck.lua b/server/paycheck.lua similarity index 100% rename from resources/[essential]/es_extended/server/paycheck.lua rename to server/paycheck.lua