Renamed py_server -> server

stolencatkarma · Oct 18, 2019 · 316865c · 316865c
1 parent d774cc6
commit 316865c
Show file tree

Hide file tree

Showing 89 changed files with 4 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,12 +11,12 @@
 /dist/*
 /build/*
 # ignore logs
-py_server/log/*
-!py_server/log/.gitkeep
+server/log/*
+!server/log/.gitkeep
 # ignore accounts
-py_server/accounts/*
+server/accounts/*
 # ignore worlds
-py_server/worlds/*
+server/worlds/*
 # ignore godot optional import settings.
 /GodotClient/.import/*
 CataclysmLD.code-workspace

diff --git a/py_server/.vscode/launch.json → server/.vscode/launch.json b/py_server/.vscode/launch.json → server/.vscode/launch.json
diff --git a/py_server/.vscode/settings.json → server/.vscode/settings.json b/py_server/.vscode/settings.json → server/.vscode/settings.json
diff --git a/py_server/.vscode/tasks.json → server/.vscode/tasks.json b/py_server/.vscode/tasks.json → server/.vscode/tasks.json
diff --git a/py_server/clean.bat → server/clean.bat b/py_server/clean.bat → server/clean.bat
diff --git a/py_server/client.json → server/client.json b/py_server/client.json → server/client.json
diff --git a/py_server/client.spec → server/client.spec b/py_server/client.spec → server/client.spec
diff --git a/py_server/data/credits/de.credits → server/data/credits/de.credits b/py_server/data/credits/de.credits → server/data/credits/de.credits
diff --git a/py_server/data/credits/en.credits → server/data/credits/en.credits b/py_server/data/credits/en.credits → server/data/credits/en.credits
diff --git a/py_server/data/credits/es_AR.credits → server/data/credits/es_AR.credits b/py_server/data/credits/es_AR.credits → server/data/credits/es_AR.credits
diff --git a/py_server/data/credits/es_ES.credits → server/data/credits/es_ES.credits b/py_server/data/credits/es_ES.credits → server/data/credits/es_ES.credits
diff --git a/py_server/data/credits/it_IT.credits → server/data/credits/it_IT.credits b/py_server/data/credits/it_IT.credits → server/data/credits/it_IT.credits
diff --git a/py_server/data/credits/ko.credits → server/data/credits/ko.credits b/py_server/data/credits/ko.credits → server/data/credits/ko.credits
diff --git a/py_server/data/credits/pt_BR.credits → server/data/credits/pt_BR.credits b/py_server/data/credits/pt_BR.credits → server/data/credits/pt_BR.credits
diff --git a/py_server/data/credits/ru.credits → server/data/credits/ru.credits b/py_server/data/credits/ru.credits → server/data/credits/ru.credits
diff --git a/py_server/data/credits/zh_CN.credits → server/data/credits/zh_CN.credits b/py_server/data/credits/zh_CN.credits → server/data/credits/zh_CN.credits
diff --git a/py_server/data/credits/zh_TW.credits → server/data/credits/zh_TW.credits b/py_server/data/credits/zh_TW.credits → server/data/credits/zh_TW.credits
diff --git a/py_server/data/global_options.json → server/data/global_options.json b/py_server/data/global_options.json → server/data/global_options.json
diff --git a/py_server/data/json/furniture.json → server/data/json/furniture.json b/py_server/data/json/furniture.json → server/data/json/furniture.json
diff --git a/py_server/data/json/items/ammo.json → server/data/json/items/ammo.json b/py_server/data/json/items/ammo.json → server/data/json/items/ammo.json
diff --git a/py_server/data/json/items/ammo_types.json → server/data/json/items/ammo_types.json b/py_server/data/json/items/ammo_types.json → server/data/json/items/ammo_types.json
diff --git a/py_server/data/json/items/armor.json → server/data/json/items/armor.json b/py_server/data/json/items/armor.json → server/data/json/items/armor.json
diff --git a/py_server/data/json/items/containers.json → server/data/json/items/containers.json b/py_server/data/json/items/containers.json → server/data/json/items/containers.json
diff --git a/py_server/data/json/items/generic.json → server/data/json/items/generic.json b/py_server/data/json/items/generic.json → server/data/json/items/generic.json
diff --git a/py_server/data/json/items/melee.json → server/data/json/items/melee.json b/py_server/data/json/items/melee.json → server/data/json/items/melee.json
diff --git a/py_server/data/json/items/metals.json → server/data/json/items/metals.json b/py_server/data/json/items/metals.json → server/data/json/items/metals.json
diff --git a/py_server/data/json/items/tools.json → server/data/json/items/tools.json b/py_server/data/json/items/tools.json → server/data/json/items/tools.json
diff --git a/py_server/data/json/items/vehicle_parts.json → server/data/json/items/vehicle_parts.json b/py_server/data/json/items/vehicle_parts.json → server/data/json/items/vehicle_parts.json
diff --git a/...son/mapgen/commercial/thrift_store01.json → ...son/mapgen/commercial/thrift_store01.json b/...son/mapgen/commercial/thrift_store01.json → ...son/mapgen/commercial/thrift_store01.json
diff --git a/...ata/json/mapgen/industrial/warehouse.json → ...ata/json/mapgen/industrial/warehouse.json b/...ata/json/mapgen/industrial/warehouse.json → ...ata/json/mapgen/industrial/warehouse.json
diff --git a/...data/json/mapgen/residential/house04.json → ...data/json/mapgen/residential/house04.json b/...data/json/mapgen/residential/house04.json → ...data/json/mapgen/residential/house04.json
diff --git a/.../json/mapgen/road/city_road_3_way_d0.json → .../json/mapgen/road/city_road_3_way_d0.json b/.../json/mapgen/road/city_road_3_way_d0.json → .../json/mapgen/road/city_road_3_way_d0.json
diff --git a/.../json/mapgen/road/city_road_3_way_p0.json → .../json/mapgen/road/city_road_3_way_p0.json b/.../json/mapgen/road/city_road_3_way_p0.json → .../json/mapgen/road/city_road_3_way_p0.json
diff --git a/.../json/mapgen/road/city_road_3_way_s0.json → .../json/mapgen/road/city_road_3_way_s0.json b/.../json/mapgen/road/city_road_3_way_s0.json → .../json/mapgen/road/city_road_3_way_s0.json
diff --git a/.../json/mapgen/road/city_road_3_way_u0.json → .../json/mapgen/road/city_road_3_way_u0.json b/.../json/mapgen/road/city_road_3_way_u0.json → .../json/mapgen/road/city_road_3_way_u0.json
diff --git a/...ata/json/mapgen/road/city_road_4_way.json → ...ata/json/mapgen/road/city_road_4_way.json b/...ata/json/mapgen/road/city_road_4_way.json → ...ata/json/mapgen/road/city_road_4_way.json
diff --git a/...er/data/json/mapgen/road/city_road_h.json → ...er/data/json/mapgen/road/city_road_h.json b/...er/data/json/mapgen/road/city_road_h.json → ...er/data/json/mapgen/road/city_road_h.json
diff --git a/...er/data/json/mapgen/road/city_road_v.json → ...er/data/json/mapgen/road/city_road_v.json b/...er/data/json/mapgen/road/city_road_v.json → ...er/data/json/mapgen/road/city_road_v.json
diff --git a/...on/mapgen/road/country_road_3_way_d0.json → ...on/mapgen/road/country_road_3_way_d0.json b/...on/mapgen/road/country_road_3_way_d0.json → ...on/mapgen/road/country_road_3_way_d0.json
diff --git a/...on/mapgen/road/country_road_3_way_p0.json → ...on/mapgen/road/country_road_3_way_p0.json b/...on/mapgen/road/country_road_3_way_p0.json → ...on/mapgen/road/country_road_3_way_p0.json
diff --git a/...on/mapgen/road/country_road_3_way_s0.json → ...on/mapgen/road/country_road_3_way_s0.json b/...on/mapgen/road/country_road_3_way_s0.json → ...on/mapgen/road/country_road_3_way_s0.json
diff --git a/...on/mapgen/road/country_road_3_way_u0.json → ...on/mapgen/road/country_road_3_way_u0.json b/...on/mapgen/road/country_road_3_way_u0.json → ...on/mapgen/road/country_road_3_way_u0.json
diff --git a/.../json/mapgen/road/country_road_4_way.json → .../json/mapgen/road/country_road_4_way.json b/.../json/mapgen/road/country_road_4_way.json → .../json/mapgen/road/country_road_4_way.json
diff --git a/...data/json/mapgen/road/country_road_h.json → ...data/json/mapgen/road/country_road_h.json b/...data/json/mapgen/road/country_road_h.json → ...data/json/mapgen/road/country_road_h.json
diff --git a/...data/json/mapgen/road/country_road_v.json → ...data/json/mapgen/road/country_road_v.json b/...data/json/mapgen/road/country_road_v.json → ...data/json/mapgen/road/country_road_v.json
diff --git a/py_server/data/json/mapgen/template.json → server/data/json/mapgen/template.json b/py_server/data/json/mapgen/template.json → server/data/json/mapgen/template.json
diff --git a/py_server/data/json/monsters/monsters.json → server/data/json/monsters/monsters.json b/py_server/data/json/monsters/monsters.json → server/data/json/monsters/monsters.json
diff --git a/...r/data/json/profession-substitutions.json → ...r/data/json/profession-substitutions.json b/...r/data/json/profession-substitutions.json → ...r/data/json/profession-substitutions.json
diff --git a/...erver/data/json/professions/survivor.json → server/data/json/professions/survivor.json b/...erver/data/json/professions/survivor.json → server/data/json/professions/survivor.json
diff --git a/.../data/json/recipes/makeshift_weapons.json → .../data/json/recipes/makeshift_weapons.json b/.../data/json/recipes/makeshift_weapons.json → .../data/json/recipes/makeshift_weapons.json
diff --git a/py_server/data/json/skills.json → server/data/json/skills.json b/py_server/data/json/skills.json → server/data/json/skills.json
diff --git a/py_server/data/json/terrain.json → server/data/json/terrain.json b/py_server/data/json/terrain.json → server/data/json/terrain.json
diff --git a/py_server/data/names/en.json → server/data/names/en.json b/py_server/data/names/en.json → server/data/names/en.json
diff --git a/py_server/data/names/ja.json → server/data/names/ja.json b/py_server/data/names/ja.json → server/data/names/ja.json
diff --git a/py_server/data/names/ko.json → server/data/names/ko.json b/py_server/data/names/ko.json → server/data/names/ko.json
diff --git a/py_server/data/names/ru.json → server/data/names/ru.json b/py_server/data/names/ru.json → server/data/names/ru.json
diff --git a/py_server/data/names/zh_CN.json → server/data/names/zh_CN.json b/py_server/data/names/zh_CN.json → server/data/names/zh_CN.json
diff --git a/py_server/data/names/zh_TW.json → server/data/names/zh_TW.json b/py_server/data/names/zh_TW.json → server/data/names/zh_TW.json
diff --git a/py_server/log/.gitkeep → server/log/.gitkeep b/py_server/log/.gitkeep → server/log/.gitkeep
diff --git a/py_server/server.cfg → server/server.cfg b/py_server/server.cfg → server/server.cfg
diff --git a/py_server/server.py → server/server.py b/py_server/server.py → server/server.py
diff --git a/py_server/server.spec → server/server.spec b/py_server/server.spec → server/server.spec
diff --git a/py_server/src/blueprint.py → server/src/blueprint.py b/py_server/src/blueprint.py → server/src/blueprint.py
diff --git a/py_server/src/bodypart.py → server/src/bodypart.py b/py_server/src/bodypart.py → server/src/bodypart.py
diff --git a/py_server/src/calendar.py → server/src/calendar.py b/py_server/src/calendar.py → server/src/calendar.py
diff --git a/py_server/src/character.py → server/src/character.py b/py_server/src/character.py → server/src/character.py
diff --git a/py_server/src/creature.py → server/src/creature.py b/py_server/src/creature.py → server/src/creature.py
diff --git a/py_server/src/faction.py → server/src/faction.py b/py_server/src/faction.py → server/src/faction.py
diff --git a/py_server/src/lighting.py → server/src/lighting.py b/py_server/src/lighting.py → server/src/lighting.py
diff --git a/py_server/src/mastermind/_mm_client.py → server/src/mastermind/_mm_client.py b/py_server/src/mastermind/_mm_client.py → server/src/mastermind/_mm_client.py
diff --git a/py_server/src/mastermind/_mm_constants.py → server/src/mastermind/_mm_constants.py b/py_server/src/mastermind/_mm_constants.py → server/src/mastermind/_mm_constants.py
diff --git a/py_server/src/mastermind/_mm_errors.py → server/src/mastermind/_mm_errors.py b/py_server/src/mastermind/_mm_errors.py → server/src/mastermind/_mm_errors.py
diff --git a/py_server/src/mastermind/_mm_netutil.py → server/src/mastermind/_mm_netutil.py b/py_server/src/mastermind/_mm_netutil.py → server/src/mastermind/_mm_netutil.py
diff --git a/py_server/src/mastermind/_mm_server.py → server/src/mastermind/_mm_server.py b/py_server/src/mastermind/_mm_server.py → server/src/mastermind/_mm_server.py
diff --git a/py_server/src/model/action.py → server/src/model/action.py b/py_server/src/model/action.py → server/src/model/action.py
diff --git a/py_server/src/model/command.py → server/src/model/command.py b/py_server/src/model/command.py → server/src/model/command.py
diff --git a/py_server/src/model/manager/furniture.py → server/src/model/manager/furniture.py b/py_server/src/model/manager/furniture.py → server/src/model/manager/furniture.py
diff --git a/py_server/src/model/manager/item.py → server/src/model/manager/item.py b/py_server/src/model/manager/item.py → server/src/model/manager/item.py
diff --git a/py_server/src/model/manager/monster.py → server/src/model/manager/monster.py b/py_server/src/model/manager/monster.py → server/src/model/manager/monster.py
diff --git a/py_server/src/model/manager/npc.py → server/src/model/manager/npc.py b/py_server/src/model/manager/npc.py → server/src/model/manager/npc.py
diff --git a/py_server/src/model/manager/profession.py → server/src/model/manager/profession.py b/py_server/src/model/manager/profession.py → server/src/model/manager/profession.py
diff --git a/py_server/src/model/manager/recipe.py → server/src/model/manager/recipe.py b/py_server/src/model/manager/recipe.py → server/src/model/manager/recipe.py
diff --git a/py_server/src/passhash.py → server/src/passhash.py b/py_server/src/passhash.py → server/src/passhash.py
diff --git a/py_server/src/position.py → server/src/position.py b/py_server/src/position.py → server/src/position.py
diff --git a/py_server/src/skill.py → server/src/skill.py b/py_server/src/skill.py → server/src/skill.py
diff --git a/py_server/src/terrain.py → server/src/terrain.py b/py_server/src/terrain.py → server/src/terrain.py
diff --git a/py_server/src/tilemanager.py → server/src/tilemanager.py b/py_server/src/tilemanager.py → server/src/tilemanager.py
diff --git a/py_server/src/worldmap.py → server/src/worldmap.py b/py_server/src/worldmap.py → server/src/worldmap.py
diff --git a/py_server/unittest/unittests.py → server/unittest/unittests.py b/py_server/unittest/unittests.py → server/unittest/unittests.py