Rebase with upstream

2019-05-28 22:15:17 -08:00 · 2019-05-28 22:15:17 -08:00 · 101b8314c9
commit 101b8314c9
2889 changed files with 481914 additions and 0 deletions
--- a/09HDscape-server/data/backups/src-backups/SRC-Jan
+++ b/09HDscape-server/data/backups/src-backups/SRC-Jan
--- a/09HDscape-server/data/backups/src-backups/SRC-Jan
+++ b/09HDscape-server/data/backups/src-backups/SRC-Jan
--- a/09HDscape-server/data/backups/src-backups/SRC-Jan
+++ b/09HDscape-server/data/backups/src-backups/SRC-Jan
--- a/09HDscape-server/data/backups/src-backups/SRC-Mar
+++ b/09HDscape-server/data/backups/src-backups/SRC-Mar
--- a/09HDscape-server/data/backups/src-backups/SRC-Oct
+++ b/09HDscape-server/data/backups/src-backups/SRC-Oct
--- a/09HDscape-server/data/backups/src-backups/SRC-Oct
+++ b/09HDscape-server/data/backups/src-backups/SRC-Oct
--- a/09HDscape-server/data/backups/src-backups/SRC-Oct
+++ b/09HDscape-server/data/backups/src-backups/SRC-Oct
--- a/09HDscape-server/data/backups/src-backups/SRC-Sep
+++ b/09HDscape-server/data/backups/src-backups/SRC-Sep
--- a/09HDscape-server/data/backups/src-backups/SRC-Sep
+++ b/09HDscape-server/data/backups/src-backups/SRC-Sep
--- a/09HDscape-server/data/backups/src-backups/SRC-Sep
+++ b/09HDscape-server/data/backups/src-backups/SRC-Sep
--- a/09HDscape-server/data/backups/src-backups/SRC-Sep
+++ b/09HDscape-server/data/backups/src-backups/SRC-Sep
--- a/09HDscape-server/data/backups/src-backups/SRC-Sep
+++ b/09HDscape-server/data/backups/src-backups/SRC-Sep
--- a/09HDscape-server/data/backups/src-backups/SRC-Sep
+++ b/09HDscape-server/data/backups/src-backups/SRC-Sep
--- a/09HDscape-server/data/backups/src-backups/SRC-Sep
+++ b/09HDscape-server/data/backups/src-backups/SRC-Sep
--- a/09HDscape-server/data/backups/src-backups/SRC-Sep
+++ b/09HDscape-server/data/backups/src-backups/SRC-Sep
--- a/09HDscape-server/data/backups/src-backups/SRC-Sep
+++ b/09HDscape-server/data/backups/src-backups/SRC-Sep
--- a/09HDscape-server/data/backups/src-backups/SRC-Sep
+++ b/09HDscape-server/data/backups/src-backups/SRC-Sep
--- a/09HDscape-server/data/cache
+++ b/09HDscape-server/data/cache
--- a/09HDscape-server/data/cache.zip
+++ b/09HDscape-server/data/cache.zip
--- a/09HDscape-server/data/cacheback
+++ b/09HDscape-server/data/cacheback
--- a/09HDscape-server/data/cachemain_file_cache.dat2
+++ b/09HDscape-server/data/cachemain_file_cache.dat2
--- a/09HDscape-server/data/cachemain_file_cache.idx255
+++ b/09HDscape-server/data/cachemain_file_cache.idx255
--- a/09HDscape-server/data/eco/ge_resource.emp
+++ b/09HDscape-server/data/eco/ge_resource.emp
@ -0,0 +1 @@
+<EFBFBD><EFBFBD>
--- a/09HDscape-server/data/eco/grand_exchange_db.emp
+++ b/09HDscape-server/data/eco/grand_exchange_db.emp
--- a/09HDscape-server/data/eco/offer_dispatch_db.emp
+++ b/09HDscape-server/data/eco/offer_dispatch_db.emp
--- a/09HDscape-server/data/kratoscache.zip
+++ b/09HDscape-server/data/kratoscache.zip
--- a/09HDscape-server/data/libs/commons-io-2.4.jar
+++ b/09HDscape-server/data/libs/commons-io-2.4.jar
--- a/09HDscape-server/data/libs/guava-18.0.jar
+++ b/09HDscape-server/data/libs/guava-18.0.jar
--- a/09HDscape-server/data/libs/javassist-3.20.0-GA.jar
+++ b/09HDscape-server/data/libs/javassist-3.20.0-GA.jar
--- a/09HDscape-server/data/libs/joda-time-2.9.9.jar
+++ b/09HDscape-server/data/libs/joda-time-2.9.9.jar
--- a/09HDscape-server/data/libs/mysql-connector-java-5.1.30-bin.jar
+++ b/09HDscape-server/data/libs/mysql-connector-java-5.1.30-bin.jar
--- a/09HDscape-server/data/libs/reflections-0.9.10.jar
+++ b/09HDscape-server/data/libs/reflections-0.9.10.jar
--- a/09HDscape-server/data/players_economy/austin.keldagrim
+++ b/09HDscape-server/data/players_economy/austin.keldagrim
--- a/09HDscape-server/data/players_economy/beta.keldagrim
+++ b/09HDscape-server/data/players_economy/beta.keldagrim
--- a/09HDscape-server/data/players_economy/castiel.keldagrim
+++ b/09HDscape-server/data/players_economy/castiel.keldagrim
--- a/09HDscape-server/data/players_economy/charlie
+++ b/09HDscape-server/data/players_economy/charlie
--- a/09HDscape-server/data/players_economy/charlie
+++ b/09HDscape-server/data/players_economy/charlie
--- a/09HDscape-server/data/players_economy/charlie.keldagrim
+++ b/09HDscape-server/data/players_economy/charlie.keldagrim
--- a/09HDscape-server/data/players_economy/clues.keldagrim
+++ b/09HDscape-server/data/players_economy/clues.keldagrim
--- a/09HDscape-server/data/players_economy/cryo.keldagrim
+++ b/09HDscape-server/data/players_economy/cryo.keldagrim
--- a/09HDscape-server/data/players_economy/cryo_2.keldagrim
+++ b/09HDscape-server/data/players_economy/cryo_2.keldagrim
--- a/09HDscape-server/data/players_economy/cups.keldagrim
+++ b/09HDscape-server/data/players_economy/cups.keldagrim
--- a/09HDscape-server/data/players_economy/deadpool.keldagrim
+++ b/09HDscape-server/data/players_economy/deadpool.keldagrim
--- a/09HDscape-server/data/players_economy/ethan.keldagrim
+++ b/09HDscape-server/data/players_economy/ethan.keldagrim
--- a/09HDscape-server/data/players_economy/help.keldagrim
+++ b/09HDscape-server/data/players_economy/help.keldagrim
--- a/09HDscape-server/data/players_economy/james.keldagrim
+++ b/09HDscape-server/data/players_economy/james.keldagrim
--- a/09HDscape-server/data/players_economy/keldagrim.keldagrim
+++ b/09HDscape-server/data/players_economy/keldagrim.keldagrim
--- a/09HDscape-server/data/players_economy/leviathan.keldagrim
+++ b/09HDscape-server/data/players_economy/leviathan.keldagrim
--- a/09HDscape-server/data/players_economy/matt.keldagrim
+++ b/09HDscape-server/data/players_economy/matt.keldagrim
--- a/09HDscape-server/data/players_economy/mod_noob.keldagrim
+++ b/09HDscape-server/data/players_economy/mod_noob.keldagrim
--- a/09HDscape-server/data/players_economy/oxzor.keldagrim
+++ b/09HDscape-server/data/players_economy/oxzor.keldagrim
--- a/09HDscape-server/data/players_economy/somebodyy.keldagrim
+++ b/09HDscape-server/data/players_economy/somebodyy.keldagrim
--- a/09HDscape-server/data/players_spawn/castiel.keldagrim
+++ b/09HDscape-server/data/players_spawn/castiel.keldagrim
--- a/09HDscape-server/data/store/dynamic_cache.keldagrim
+++ b/09HDscape-server/data/store/dynamic_cache.keldagrim