diff --git a/Terrarum_renewed.iml b/Terrarum_renewed.iml
index 35a74489f..728bcc8a5 100644
--- a/Terrarum_renewed.iml
+++ b/Terrarum_renewed.iml
@@ -4,7 +4,7 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/assets" type="java-resource" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/res/4096.frg b/assets/4096.frg
similarity index 100%
rename from res/4096.frg
rename to assets/4096.frg
diff --git a/res/4096.vrt b/assets/4096.vrt
similarity index 100%
rename from res/4096.vrt
rename to assets/4096.vrt
diff --git a/res/batchtest.txt b/assets/batchtest.txt
similarity index 100%
rename from res/batchtest.txt
rename to assets/batchtest.txt
diff --git a/res/blur.frg b/assets/blur.frg
similarity index 100%
rename from res/blur.frg
rename to assets/blur.frg
diff --git a/res/blurH.vrt b/assets/blurH.vrt
similarity index 100%
rename from res/blurH.vrt
rename to assets/blurH.vrt
diff --git a/res/blurV.vrt b/assets/blurV.vrt
similarity index 100%
rename from res/blurV.vrt
rename to assets/blurV.vrt
diff --git a/res/books/Blacksmith_s_handbook.txt b/assets/books/Blacksmith_s_handbook.txt
similarity index 100%
rename from res/books/Blacksmith_s_handbook.txt
rename to assets/books/Blacksmith_s_handbook.txt
diff --git a/res/books/Book_writing_guide.txt b/assets/books/Book_writing_guide.txt
similarity index 100%
rename from res/books/Book_writing_guide.txt
rename to assets/books/Book_writing_guide.txt
diff --git a/res/books/cjk_test.txt b/assets/books/cjk_test.txt
similarity index 100%
rename from res/books/cjk_test.txt
rename to assets/books/cjk_test.txt
diff --git a/res/books/hangul_test.txt b/assets/books/hangul_test.txt
similarity index 100%
rename from res/books/hangul_test.txt
rename to assets/books/hangul_test.txt
diff --git a/res/books/isl_test.txt b/assets/books/isl_test.txt
similarity index 100%
rename from res/books/isl_test.txt
rename to assets/books/isl_test.txt
diff --git a/res/books/kana_test.txt b/assets/books/kana_test.txt
similarity index 100%
rename from res/books/kana_test.txt
rename to assets/books/kana_test.txt
diff --git a/res/books/kana_test_2.txt b/assets/books/kana_test_2.txt
similarity index 100%
rename from res/books/kana_test_2.txt
rename to assets/books/kana_test_2.txt
diff --git a/res/books/kana_test_2_kanji.txt b/assets/books/kana_test_2_kanji.txt
similarity index 100%
rename from res/books/kana_test_2_kanji.txt
rename to assets/books/kana_test_2_kanji.txt
diff --git a/res/books/kana_test_kanji.txt b/assets/books/kana_test_kanji.txt
similarity index 100%
rename from res/books/kana_test_kanji.txt
rename to assets/books/kana_test_kanji.txt
diff --git a/res/books/kanji_test_3.txt b/assets/books/kanji_test_3.txt
similarity index 100%
rename from res/books/kanji_test_3.txt
rename to assets/books/kanji_test_3.txt
diff --git a/res/books/kanji_test_4.txt b/assets/books/kanji_test_4.txt
similarity index 100%
rename from res/books/kanji_test_4.txt
rename to assets/books/kanji_test_4.txt
diff --git a/res/books/polyglot_test.txt b/assets/books/polyglot_test.txt
similarity index 100%
rename from res/books/polyglot_test.txt
rename to assets/books/polyglot_test.txt
diff --git a/res/books/polyglot_test_2.txt b/assets/books/polyglot_test_2.txt
similarity index 100%
rename from res/books/polyglot_test_2.txt
rename to assets/books/polyglot_test_2.txt
diff --git a/res/books/runic_short_1.txt b/assets/books/runic_short_1.txt
similarity index 100%
rename from res/books/runic_short_1.txt
rename to assets/books/runic_short_1.txt
diff --git a/res/books/runic_short_2.txt b/assets/books/runic_short_2.txt
similarity index 100%
rename from res/books/runic_short_2.txt
rename to assets/books/runic_short_2.txt
diff --git a/res/books/userguide_ENG.aux b/assets/books/userguide_ENG.aux
similarity index 100%
rename from res/books/userguide_ENG.aux
rename to assets/books/userguide_ENG.aux
diff --git a/res/books/userguide_ENG.log b/assets/books/userguide_ENG.log
similarity index 100%
rename from res/books/userguide_ENG.log
rename to assets/books/userguide_ENG.log
diff --git a/res/books/userguide_ENG.out b/assets/books/userguide_ENG.out
similarity index 100%
rename from res/books/userguide_ENG.out
rename to assets/books/userguide_ENG.out
diff --git a/res/books/userguide_ENG.pdf b/assets/books/userguide_ENG.pdf
similarity index 100%
rename from res/books/userguide_ENG.pdf
rename to assets/books/userguide_ENG.pdf
diff --git a/res/books/userguide_ENG.synctex.gz b/assets/books/userguide_ENG.synctex.gz
similarity index 100%
rename from res/books/userguide_ENG.synctex.gz
rename to assets/books/userguide_ENG.synctex.gz
diff --git a/res/books/userguide_ENG.tex b/assets/books/userguide_ENG.tex
similarity index 100%
rename from res/books/userguide_ENG.tex
rename to assets/books/userguide_ENG.tex
diff --git a/res/books/userguide_ENG.toc b/assets/books/userguide_ENG.toc
similarity index 100%
rename from res/books/userguide_ENG.toc
rename to assets/books/userguide_ENG.toc
diff --git a/res/books/userguide_NON.aux b/assets/books/userguide_NON.aux
similarity index 100%
rename from res/books/userguide_NON.aux
rename to assets/books/userguide_NON.aux
diff --git a/res/books/userguide_NON.log b/assets/books/userguide_NON.log
similarity index 100%
rename from res/books/userguide_NON.log
rename to assets/books/userguide_NON.log
diff --git a/res/books/userguide_NON.out b/assets/books/userguide_NON.out
similarity index 100%
rename from res/books/userguide_NON.out
rename to assets/books/userguide_NON.out
diff --git a/res/books/userguide_NON.pdf b/assets/books/userguide_NON.pdf
similarity index 100%
rename from res/books/userguide_NON.pdf
rename to assets/books/userguide_NON.pdf
diff --git a/res/books/userguide_NON.synctex.gz b/assets/books/userguide_NON.synctex.gz
similarity index 100%
rename from res/books/userguide_NON.synctex.gz
rename to assets/books/userguide_NON.synctex.gz
diff --git a/res/books/userguide_NON.tex b/assets/books/userguide_NON.tex
similarity index 100%
rename from res/books/userguide_NON.tex
rename to assets/books/userguide_NON.tex
diff --git a/res/books/userguide_NON.toc b/assets/books/userguide_NON.toc
similarity index 100%
rename from res/books/userguide_NON.toc
rename to assets/books/userguide_NON.toc
diff --git a/res/graphics/art/.gitattributes b/assets/graphics/art/.gitattributes
similarity index 100%
rename from res/graphics/art/.gitattributes
rename to assets/graphics/art/.gitattributes
diff --git a/res/graphics/background_black.png b/assets/graphics/background_black.png
similarity index 100%
rename from res/graphics/background_black.png
rename to assets/graphics/background_black.png
diff --git a/res/graphics/background_white.png b/assets/graphics/background_white.png
similarity index 100%
rename from res/graphics/background_white.png
rename to assets/graphics/background_white.png
diff --git a/res/graphics/breakAnim.png b/assets/graphics/breakAnim.png
similarity index 100%
rename from res/graphics/breakAnim.png
rename to assets/graphics/breakAnim.png
diff --git a/res/graphics/colourmap/black_body_col_1000_40000_K.png b/assets/graphics/colourmap/black_body_col_1000_40000_K.png
similarity index 100%
rename from res/graphics/colourmap/black_body_col_1000_40000_K.png
rename to assets/graphics/colourmap/black_body_col_1000_40000_K.png
diff --git a/res/graphics/colourmap/black_body_how_to_use.txt b/assets/graphics/colourmap/black_body_how_to_use.txt
similarity index 100%
rename from res/graphics/colourmap/black_body_how_to_use.txt
rename to assets/graphics/colourmap/black_body_how_to_use.txt
diff --git a/res/graphics/colourmap/col12spectrum.png b/assets/graphics/colourmap/col12spectrum.png
similarity index 100%
rename from res/graphics/colourmap/col12spectrum.png
rename to assets/graphics/colourmap/col12spectrum.png
diff --git a/res/graphics/colourmap/col216spectrum.png b/assets/graphics/colourmap/col216spectrum.png
similarity index 100%
rename from res/graphics/colourmap/col216spectrum.png
rename to assets/graphics/colourmap/col216spectrum.png
diff --git a/res/graphics/colourmap/colourkey12.png b/assets/graphics/colourmap/colourkey12.png
similarity index 100%
rename from res/graphics/colourmap/colourkey12.png
rename to assets/graphics/colourmap/colourkey12.png
diff --git a/res/graphics/colourmap/colourkey216.png b/assets/graphics/colourmap/colourkey216.png
similarity index 100%
rename from res/graphics/colourmap/colourkey216.png
rename to assets/graphics/colourmap/colourkey216.png
diff --git a/res/graphics/colourmap/health_bar_colouring_4096.png b/assets/graphics/colourmap/health_bar_colouring_4096.png
similarity index 100%
rename from res/graphics/colourmap/health_bar_colouring_4096.png
rename to assets/graphics/colourmap/health_bar_colouring_4096.png
diff --git a/res/graphics/colourmap/sky_colour.png b/assets/graphics/colourmap/sky_colour.png
similarity index 100%
rename from res/graphics/colourmap/sky_colour.png
rename to assets/graphics/colourmap/sky_colour.png
diff --git a/res/graphics/fonts/Braille.png b/assets/graphics/fonts/Braille.png
similarity index 100%
rename from res/graphics/fonts/Braille.png
rename to assets/graphics/fonts/Braille.png
diff --git a/res/graphics/fonts/LatinExtA_ef.png b/assets/graphics/fonts/LatinExtA_ef.png
similarity index 100%
rename from res/graphics/fonts/LatinExtA_ef.png
rename to assets/graphics/fonts/LatinExtA_ef.png
diff --git a/res/graphics/fonts/LatinExtA_fullwidth.png b/assets/graphics/fonts/LatinExtA_fullwidth.png
similarity index 100%
rename from res/graphics/fonts/LatinExtA_fullwidth.png
rename to assets/graphics/fonts/LatinExtA_fullwidth.png
diff --git a/res/graphics/fonts/OSXBSD8x16.png b/assets/graphics/fonts/OSXBSD8x16.png
similarity index 100%
rename from res/graphics/fonts/OSXBSD8x16.png
rename to assets/graphics/fonts/OSXBSD8x16.png
diff --git a/res/graphics/fonts/alphanumeric_small.png b/assets/graphics/fonts/alphanumeric_small.png
similarity index 100%
rename from res/graphics/fonts/alphanumeric_small.png
rename to assets/graphics/fonts/alphanumeric_small.png
diff --git a/res/graphics/fonts/ascii_fullwidth.png b/assets/graphics/fonts/ascii_fullwidth.png
similarity index 100%
rename from res/graphics/fonts/ascii_fullwidth.png
rename to assets/graphics/fonts/ascii_fullwidth.png
diff --git a/res/graphics/fonts/ascii_special_ef.png b/assets/graphics/fonts/ascii_special_ef.png
similarity index 100%
rename from res/graphics/fonts/ascii_special_ef.png
rename to assets/graphics/fonts/ascii_special_ef.png
diff --git a/res/graphics/fonts/cjkpunct.png b/assets/graphics/fonts/cjkpunct.png
similarity index 100%
rename from res/graphics/fonts/cjkpunct.png
rename to assets/graphics/fonts/cjkpunct.png
diff --git a/res/graphics/fonts/cyrilic_ef.png b/assets/graphics/fonts/cyrilic_ef.png
similarity index 100%
rename from res/graphics/fonts/cyrilic_ef.png
rename to assets/graphics/fonts/cyrilic_ef.png
diff --git a/res/graphics/fonts/cyrilic_fullwidth.png b/assets/graphics/fonts/cyrilic_fullwidth.png
similarity index 100%
rename from res/graphics/fonts/cyrilic_fullwidth.png
rename to assets/graphics/fonts/cyrilic_fullwidth.png
diff --git a/res/graphics/fonts/fullwidth_forms.png b/assets/graphics/fonts/fullwidth_forms.png
similarity index 100%
rename from res/graphics/fonts/fullwidth_forms.png
rename to assets/graphics/fonts/fullwidth_forms.png
diff --git a/res/graphics/fonts/futhark.png b/assets/graphics/fonts/futhark.png
similarity index 100%
rename from res/graphics/fonts/futhark.png
rename to assets/graphics/fonts/futhark.png
diff --git a/res/graphics/fonts/greek_ef.png b/assets/graphics/fonts/greek_ef.png
similarity index 100%
rename from res/graphics/fonts/greek_ef.png
rename to assets/graphics/fonts/greek_ef.png
diff --git a/res/graphics/fonts/greek_fullwidth.png b/assets/graphics/fonts/greek_fullwidth.png
similarity index 100%
rename from res/graphics/fonts/greek_fullwidth.png
rename to assets/graphics/fonts/greek_fullwidth.png
diff --git a/res/graphics/fonts/han_johab.png b/assets/graphics/fonts/han_johab.png
similarity index 100%
rename from res/graphics/fonts/han_johab.png
rename to assets/graphics/fonts/han_johab.png
diff --git a/res/graphics/fonts/kana.png b/assets/graphics/fonts/kana.png
similarity index 100%
rename from res/graphics/fonts/kana.png
rename to assets/graphics/fonts/kana.png
diff --git a/res/graphics/fonts/numeric_small.png b/assets/graphics/fonts/numeric_small.png
similarity index 100%
rename from res/graphics/fonts/numeric_small.png
rename to assets/graphics/fonts/numeric_small.png
diff --git a/res/graphics/fonts/romana_ef.png b/assets/graphics/fonts/romana_ef.png
similarity index 100%
rename from res/graphics/fonts/romana_ef.png
rename to assets/graphics/fonts/romana_ef.png
diff --git a/res/graphics/fonts/romana_fullwidth.png b/assets/graphics/fonts/romana_fullwidth.png
similarity index 100%
rename from res/graphics/fonts/romana_fullwidth.png
rename to assets/graphics/fonts/romana_fullwidth.png
diff --git a/assets/graphics/fonts/thai_fullwidth.png b/assets/graphics/fonts/thai_fullwidth.png
new file mode 100644
index 000000000..26ce5b606
Binary files /dev/null and b/assets/graphics/fonts/thai_fullwidth.png differ
diff --git a/res/graphics/fonts/unipunct.png b/assets/graphics/fonts/unipunct.png
similarity index 100%
rename from res/graphics/fonts/unipunct.png
rename to assets/graphics/fonts/unipunct.png
diff --git a/res/graphics/fonts/wenquanyi_11pt_part1.png b/assets/graphics/fonts/wenquanyi_11pt_part1.png
similarity index 100%
rename from res/graphics/fonts/wenquanyi_11pt_part1.png
rename to assets/graphics/fonts/wenquanyi_11pt_part1.png
diff --git a/res/graphics/fonts/wenquanyi_11pt_part2.png b/assets/graphics/fonts/wenquanyi_11pt_part2.png
similarity index 100%
rename from res/graphics/fonts/wenquanyi_11pt_part2.png
rename to assets/graphics/fonts/wenquanyi_11pt_part2.png
diff --git a/res/graphics/gui/StoneGUITex.png b/assets/graphics/gui/StoneGUITex.png
similarity index 100%
rename from res/graphics/gui/StoneGUITex.png
rename to assets/graphics/gui/StoneGUITex.png
diff --git a/res/graphics/gui/control_helper_body.png b/assets/graphics/gui/control_helper_body.png
similarity index 100%
rename from res/graphics/gui/control_helper_body.png
rename to assets/graphics/gui/control_helper_body.png
diff --git a/res/graphics/gui/control_helper_left b/assets/graphics/gui/control_helper_left
similarity index 100%
rename from res/graphics/gui/control_helper_left
rename to assets/graphics/gui/control_helper_left
diff --git a/res/graphics/gui/control_helper_right.png b/assets/graphics/gui/control_helper_right.png
similarity index 100%
rename from res/graphics/gui/control_helper_right.png
rename to assets/graphics/gui/control_helper_right.png
diff --git a/res/graphics/gui/creativeInventory/.gitattributes b/assets/graphics/gui/creativeInventory/.gitattributes
similarity index 100%
rename from res/graphics/gui/creativeInventory/.gitattributes
rename to assets/graphics/gui/creativeInventory/.gitattributes
diff --git a/res/graphics/gui/creativeInventory/creativePalette.png b/assets/graphics/gui/creativeInventory/creativePalette.png
similarity index 100%
rename from res/graphics/gui/creativeInventory/creativePalette.png
rename to assets/graphics/gui/creativeInventory/creativePalette.png
diff --git a/res/graphics/gui/cursor_black_over.png b/assets/graphics/gui/cursor_black_over.png
similarity index 100%
rename from res/graphics/gui/cursor_black_over.png
rename to assets/graphics/gui/cursor_black_over.png
diff --git a/res/graphics/gui/cursor_over.png b/assets/graphics/gui/cursor_over.png
similarity index 100%
rename from res/graphics/gui/cursor_over.png
rename to assets/graphics/gui/cursor_over.png
diff --git a/res/graphics/gui/cursor_pressed.png b/assets/graphics/gui/cursor_pressed.png
similarity index 100%
rename from res/graphics/gui/cursor_pressed.png
rename to assets/graphics/gui/cursor_pressed.png
diff --git a/res/graphics/gui/message_twoline_black_body.png b/assets/graphics/gui/message_twoline_black_body.png
similarity index 100%
rename from res/graphics/gui/message_twoline_black_body.png
rename to assets/graphics/gui/message_twoline_black_body.png
diff --git a/res/graphics/gui/message_twoline_black_left.png b/assets/graphics/gui/message_twoline_black_left.png
similarity index 100%
rename from res/graphics/gui/message_twoline_black_left.png
rename to assets/graphics/gui/message_twoline_black_left.png
diff --git a/res/graphics/gui/message_twoline_black_right.png b/assets/graphics/gui/message_twoline_black_right.png
similarity index 100%
rename from res/graphics/gui/message_twoline_black_right.png
rename to assets/graphics/gui/message_twoline_black_right.png
diff --git a/res/graphics/gui/progress_round_sheet.png b/assets/graphics/gui/progress_round_sheet.png
similarity index 100%
rename from res/graphics/gui/progress_round_sheet.png
rename to assets/graphics/gui/progress_round_sheet.png
diff --git a/res/graphics/gui/quickbar/hotbar.png b/assets/graphics/gui/quickbar/hotbar.png
similarity index 100%
rename from res/graphics/gui/quickbar/hotbar.png
rename to assets/graphics/gui/quickbar/hotbar.png
diff --git a/res/graphics/gui/quickbar/hotbarIndicator.png b/assets/graphics/gui/quickbar/hotbarIndicator.png
similarity index 100%
rename from res/graphics/gui/quickbar/hotbarIndicator.png
rename to assets/graphics/gui/quickbar/hotbarIndicator.png
diff --git a/res/graphics/gui/quickbar/item_slot.png b/assets/graphics/gui/quickbar/item_slot.png
similarity index 100%
rename from res/graphics/gui/quickbar/item_slot.png
rename to assets/graphics/gui/quickbar/item_slot.png
diff --git a/res/graphics/gui/quickbar/item_slot_large.png b/assets/graphics/gui/quickbar/item_slot_large.png
similarity index 100%
rename from res/graphics/gui/quickbar/item_slot_large.png
rename to assets/graphics/gui/quickbar/item_slot_large.png
diff --git a/res/graphics/gui/quickbar/slot_separator.png b/assets/graphics/gui/quickbar/slot_separator.png
similarity index 100%
rename from res/graphics/gui/quickbar/slot_separator.png
rename to assets/graphics/gui/quickbar/slot_separator.png
diff --git a/res/graphics/gui/quickbar/topbar_creative.png b/assets/graphics/gui/quickbar/topbar_creative.png
similarity index 100%
rename from res/graphics/gui/quickbar/topbar_creative.png
rename to assets/graphics/gui/quickbar/topbar_creative.png
diff --git a/res/graphics/gui/tooltip_black_body.png b/assets/graphics/gui/tooltip_black_body.png
similarity index 100%
rename from res/graphics/gui/tooltip_black_body.png
rename to assets/graphics/gui/tooltip_black_body.png
diff --git a/res/graphics/gui/tooltip_black_left.png b/assets/graphics/gui/tooltip_black_left.png
similarity index 100%
rename from res/graphics/gui/tooltip_black_left.png
rename to assets/graphics/gui/tooltip_black_left.png
diff --git a/res/graphics/gui/tooltip_black_right.png b/assets/graphics/gui/tooltip_black_right.png
similarity index 100%
rename from res/graphics/gui/tooltip_black_right.png
rename to assets/graphics/gui/tooltip_black_right.png
diff --git a/res/graphics/gui/ui_background.png b/assets/graphics/gui/ui_background.png
similarity index 100%
rename from res/graphics/gui/ui_background.png
rename to assets/graphics/gui/ui_background.png
diff --git a/res/graphics/gui/ui_corners.png b/assets/graphics/gui/ui_corners.png
similarity index 100%
rename from res/graphics/gui/ui_corners.png
rename to assets/graphics/gui/ui_corners.png
diff --git a/res/graphics/gui/ui_separator.png b/assets/graphics/gui/ui_separator.png
similarity index 100%
rename from res/graphics/gui/ui_separator.png
rename to assets/graphics/gui/ui_separator.png
diff --git a/res/graphics/gui/ui_sides.png b/assets/graphics/gui/ui_sides.png
similarity index 100%
rename from res/graphics/gui/ui_sides.png
rename to assets/graphics/gui/ui_sides.png
diff --git a/res/graphics/gui/zoom_menu.png b/assets/graphics/gui/zoom_menu.png
similarity index 100%
rename from res/graphics/gui/zoom_menu.png
rename to assets/graphics/gui/zoom_menu.png
diff --git a/res/graphics/gui/zoom_menu.raw b/assets/graphics/gui/zoom_menu.raw
similarity index 100%
rename from res/graphics/gui/zoom_menu.raw
rename to assets/graphics/gui/zoom_menu.raw
diff --git a/res/graphics/gui/zoom_menu12.raw b/assets/graphics/gui/zoom_menu12.raw
similarity index 100%
rename from res/graphics/gui/zoom_menu12.raw
rename to assets/graphics/gui/zoom_menu12.raw
diff --git a/res/graphics/items/items.png b/assets/graphics/items/items.png
similarity index 100%
rename from res/graphics/items/items.png
rename to assets/graphics/items/items.png
diff --git a/res/graphics/items/items24.png b/assets/graphics/items/items24.png
similarity index 100%
rename from res/graphics/items/items24.png
rename to assets/graphics/items/items24.png
diff --git a/res/graphics/items/items48.png b/assets/graphics/items/items48.png
similarity index 100%
rename from res/graphics/items/items48.png
rename to assets/graphics/items/items48.png
diff --git a/res/graphics/logo_placeholder.png b/assets/graphics/logo_placeholder.png
similarity index 100%
rename from res/graphics/logo_placeholder.png
rename to assets/graphics/logo_placeholder.png
diff --git a/res/graphics/logo_placeholder_noreflection.png b/assets/graphics/logo_placeholder_noreflection.png
similarity index 100%
rename from res/graphics/logo_placeholder_noreflection.png
rename to assets/graphics/logo_placeholder_noreflection.png
diff --git a/res/graphics/overlay_bloodshot.png b/assets/graphics/overlay_bloodshot.png
similarity index 100%
rename from res/graphics/overlay_bloodshot.png
rename to assets/graphics/overlay_bloodshot.png
diff --git a/res/graphics/overlay_darkrim.png b/assets/graphics/overlay_darkrim.png
similarity index 100%
rename from res/graphics/overlay_darkrim.png
rename to assets/graphics/overlay_darkrim.png
diff --git a/res/graphics/overlay_darkrim_deletemask.png b/assets/graphics/overlay_darkrim_deletemask.png
similarity index 100%
rename from res/graphics/overlay_darkrim_deletemask.png
rename to assets/graphics/overlay_darkrim_deletemask.png
diff --git a/res/graphics/placeholder.png b/assets/graphics/placeholder.png
similarity index 100%
rename from res/graphics/placeholder.png
rename to assets/graphics/placeholder.png
diff --git a/res/graphics/sprites/fixtures/tiki_torch.png b/assets/graphics/sprites/fixtures/tiki_torch.png
similarity index 100%
rename from res/graphics/sprites/fixtures/tiki_torch.png
rename to assets/graphics/sprites/fixtures/tiki_torch.png
diff --git a/res/graphics/sprites/slime.png b/assets/graphics/sprites/slime.png
similarity index 100%
rename from res/graphics/sprites/slime.png
rename to assets/graphics/sprites/slime.png
diff --git a/res/graphics/sprites/slime_1.png b/assets/graphics/sprites/slime_1.png
similarity index 100%
rename from res/graphics/sprites/slime_1.png
rename to assets/graphics/sprites/slime_1.png
diff --git a/res/graphics/sprites/sprite_placeholder_24_48.png b/assets/graphics/sprites/sprite_placeholder_24_48.png
similarity index 100%
rename from res/graphics/sprites/sprite_placeholder_24_48.png
rename to assets/graphics/sprites/sprite_placeholder_24_48.png
diff --git a/res/graphics/sprites/test_player.png b/assets/graphics/sprites/test_player.png
similarity index 100%
rename from res/graphics/sprites/test_player.png
rename to assets/graphics/sprites/test_player.png
diff --git a/res/graphics/sprites/test_player_2.png b/assets/graphics/sprites/test_player_2.png
similarity index 100%
rename from res/graphics/sprites/test_player_2.png
rename to assets/graphics/sprites/test_player_2.png
diff --git a/res/graphics/sprites/test_player_glow.png b/assets/graphics/sprites/test_player_glow.png
similarity index 100%
rename from res/graphics/sprites/test_player_glow.png
rename to assets/graphics/sprites/test_player_glow.png
diff --git a/res/graphics/sprites/test_player_raw.raw b/assets/graphics/sprites/test_player_raw.raw
similarity index 100%
rename from res/graphics/sprites/test_player_raw.raw
rename to assets/graphics/sprites/test_player_raw.raw
diff --git a/res/graphics/terrain/fluid.png b/assets/graphics/terrain/fluid.png
similarity index 100%
rename from res/graphics/terrain/fluid.png
rename to assets/graphics/terrain/fluid.png
diff --git a/res/graphics/terrain/grassplusplus.png b/assets/graphics/terrain/grassplusplus.png
similarity index 100%
rename from res/graphics/terrain/grassplusplus.png
rename to assets/graphics/terrain/grassplusplus.png
diff --git a/res/graphics/terrain/terrain.png b/assets/graphics/terrain/terrain.png
similarity index 100%
rename from res/graphics/terrain/terrain.png
rename to assets/graphics/terrain/terrain.png
diff --git a/res/graphics/terrain/terrain12.raw b/assets/graphics/terrain/terrain12.raw
similarity index 100%
rename from res/graphics/terrain/terrain12.raw
rename to assets/graphics/terrain/terrain12.raw
diff --git a/res/graphics/terrain/terrain_12.raw b/assets/graphics/terrain/terrain_12.raw
similarity index 100%
rename from res/graphics/terrain/terrain_12.raw
rename to assets/graphics/terrain/terrain_12.raw
diff --git a/res/graphics/terrain/terrain_old.png b/assets/graphics/terrain/terrain_old.png
similarity index 100%
rename from res/graphics/terrain/terrain_old.png
rename to assets/graphics/terrain/terrain_old.png
diff --git a/res/graphics/terrain/terrain_ref.png b/assets/graphics/terrain/terrain_ref.png
similarity index 100%
rename from res/graphics/terrain/terrain_ref.png
rename to assets/graphics/terrain/terrain_ref.png
diff --git a/res/graphics/terrain/wall.png b/assets/graphics/terrain/wall.png
similarity index 100%
rename from res/graphics/terrain/wall.png
rename to assets/graphics/terrain/wall.png
diff --git a/res/graphics/terrain/wall_old.png b/assets/graphics/terrain/wall_old.png
similarity index 100%
rename from res/graphics/terrain/wall_old.png
rename to assets/graphics/terrain/wall_old.png
diff --git a/res/graphics/terrain/wire.png b/assets/graphics/terrain/wire.png
similarity index 100%
rename from res/graphics/terrain/wire.png
rename to assets/graphics/terrain/wire.png
diff --git a/res/graphics/weathers/generic_light.png b/assets/graphics/weathers/generic_light.png
similarity index 100%
rename from res/graphics/weathers/generic_light.png
rename to assets/graphics/weathers/generic_light.png
diff --git a/res/graphics/weathers/generic_skybox.png b/assets/graphics/weathers/generic_skybox.png
similarity index 100%
rename from res/graphics/weathers/generic_skybox.png
rename to assets/graphics/weathers/generic_skybox.png
diff --git a/res/keylayout.json b/assets/keylayout.json
similarity index 100%
rename from res/keylayout.json
rename to assets/keylayout.json
diff --git a/res/locales/bgBG/Polyglot-100_bgBG.json b/assets/locales/bgBG/Polyglot-100_bgBG.json
similarity index 100%
rename from res/locales/bgBG/Polyglot-100_bgBG.json
rename to assets/locales/bgBG/Polyglot-100_bgBG.json
diff --git a/res/locales/bgBG/game.json b/assets/locales/bgBG/game.json
similarity index 100%
rename from res/locales/bgBG/game.json
rename to assets/locales/bgBG/game.json
diff --git a/res/locales/csCZ/Polyglot-100_csCZ.json b/assets/locales/csCZ/Polyglot-100_csCZ.json
similarity index 100%
rename from res/locales/csCZ/Polyglot-100_csCZ.json
rename to assets/locales/csCZ/Polyglot-100_csCZ.json
diff --git a/res/locales/csCZ/game.json b/assets/locales/csCZ/game.json
similarity index 100%
rename from res/locales/csCZ/game.json
rename to assets/locales/csCZ/game.json
diff --git a/res/locales/daDK/Polyglot-100_daDK.json b/assets/locales/daDK/Polyglot-100_daDK.json
similarity index 100%
rename from res/locales/daDK/Polyglot-100_daDK.json
rename to assets/locales/daDK/Polyglot-100_daDK.json
diff --git a/res/locales/daDK/game.json b/assets/locales/daDK/game.json
similarity index 100%
rename from res/locales/daDK/game.json
rename to assets/locales/daDK/game.json
diff --git a/res/locales/de/Polyglot-100_de.json b/assets/locales/de/Polyglot-100_de.json
similarity index 100%
rename from res/locales/de/Polyglot-100_de.json
rename to assets/locales/de/Polyglot-100_de.json
diff --git a/res/locales/de/game.json b/assets/locales/de/game.json
similarity index 100%
rename from res/locales/de/game.json
rename to assets/locales/de/game.json
diff --git a/res/locales/elGR/Polyglot-100_elGR.json b/assets/locales/elGR/Polyglot-100_elGR.json
similarity index 100%
rename from res/locales/elGR/Polyglot-100_elGR.json
rename to assets/locales/elGR/Polyglot-100_elGR.json
diff --git a/res/locales/elGR/game.json b/assets/locales/elGR/game.json
similarity index 100%
rename from res/locales/elGR/game.json
rename to assets/locales/elGR/game.json
diff --git a/res/locales/en/Polyglot-100_en.json b/assets/locales/en/Polyglot-100_en.json
similarity index 100%
rename from res/locales/en/Polyglot-100_en.json
rename to assets/locales/en/Polyglot-100_en.json
diff --git a/res/locales/en/configurator.json b/assets/locales/en/configurator.json
similarity index 100%
rename from res/locales/en/configurator.json
rename to assets/locales/en/configurator.json
diff --git a/res/locales/en/devmsg.json b/assets/locales/en/devmsg.json
similarity index 100%
rename from res/locales/en/devmsg.json
rename to assets/locales/en/devmsg.json
diff --git a/res/locales/en/game.json b/assets/locales/en/game.json
similarity index 100%
rename from res/locales/en/game.json
rename to assets/locales/en/game.json
diff --git a/res/locales/en/help.json b/assets/locales/en/help.json
similarity index 100%
rename from res/locales/en/help.json
rename to assets/locales/en/help.json
diff --git a/res/locales/en/tiles.json b/assets/locales/en/tiles.json
similarity index 100%
rename from res/locales/en/tiles.json
rename to assets/locales/en/tiles.json
diff --git a/res/locales/en/tips.json b/assets/locales/en/tips.json
similarity index 100%
rename from res/locales/en/tips.json
rename to assets/locales/en/tips.json
diff --git a/res/locales/es/Polyglot-100_es.json b/assets/locales/es/Polyglot-100_es.json
similarity index 100%
rename from res/locales/es/Polyglot-100_es.json
rename to assets/locales/es/Polyglot-100_es.json
diff --git a/res/locales/es/game.json b/assets/locales/es/game.json
similarity index 100%
rename from res/locales/es/game.json
rename to assets/locales/es/game.json
diff --git a/res/locales/fiFI/Polyglot-100_fiFI.json b/assets/locales/fiFI/Polyglot-100_fiFI.json
similarity index 100%
rename from res/locales/fiFI/Polyglot-100_fiFI.json
rename to assets/locales/fiFI/Polyglot-100_fiFI.json
diff --git a/res/locales/fiFI/game.json b/assets/locales/fiFI/game.json
similarity index 100%
rename from res/locales/fiFI/game.json
rename to assets/locales/fiFI/game.json
diff --git a/res/locales/fiFI/tips.json b/assets/locales/fiFI/tips.json
similarity index 100%
rename from res/locales/fiFI/tips.json
rename to assets/locales/fiFI/tips.json
diff --git a/res/locales/frFR/Polyglot-100_frFR.json b/assets/locales/frFR/Polyglot-100_frFR.json
similarity index 99%
rename from res/locales/frFR/Polyglot-100_frFR.json
rename to assets/locales/frFR/Polyglot-100_frFR.json
index c448ec503..e90ca0bc0 100644
--- a/res/locales/frFR/Polyglot-100_frFR.json
+++ b/assets/locales/frFR/Polyglot-100_frFR.json
@@ -1129,11 +1129,11 @@
             },
             {
                 "n": "GAME_CHARACTER_HEART",
-                "s": "Coeur"
+                "s": "Cœur"
             },
             {
                 "n": "GAME_CHARACTER_HEART_PLURAL",
-                "s": "Coeurs"
+                "s": "Cœurs"
             },
             {
                 "n": "GAME_CHARACTER_LEVEL",
diff --git a/res/locales/frFR/configurator.json b/assets/locales/frFR/configurator.json
similarity index 100%
rename from res/locales/frFR/configurator.json
rename to assets/locales/frFR/configurator.json
diff --git a/res/locales/frFR/devmsg.json b/assets/locales/frFR/devmsg.json
similarity index 100%
rename from res/locales/frFR/devmsg.json
rename to assets/locales/frFR/devmsg.json
diff --git a/res/locales/frFR/game.json b/assets/locales/frFR/game.json
similarity index 100%
rename from res/locales/frFR/game.json
rename to assets/locales/frFR/game.json
diff --git a/res/locales/frFR/tips.json b/assets/locales/frFR/tips.json
similarity index 100%
rename from res/locales/frFR/tips.json
rename to assets/locales/frFR/tips.json
diff --git a/res/locales/helpOnTheFly.csv b/assets/locales/helpOnTheFly.csv
similarity index 100%
rename from res/locales/helpOnTheFly.csv
rename to assets/locales/helpOnTheFly.csv
diff --git a/res/locales/huHU/Polyglot-100_huHU.json b/assets/locales/huHU/Polyglot-100_huHU.json
similarity index 100%
rename from res/locales/huHU/Polyglot-100_huHU.json
rename to assets/locales/huHU/Polyglot-100_huHU.json
diff --git a/res/locales/huHU/game.json b/assets/locales/huHU/game.json
similarity index 100%
rename from res/locales/huHU/game.json
rename to assets/locales/huHU/game.json
diff --git a/res/locales/isIC/Polyglot-100_isIC.json b/assets/locales/isIC/Polyglot-100_isIC.json
similarity index 100%
rename from res/locales/isIC/Polyglot-100_isIC.json
rename to assets/locales/isIC/Polyglot-100_isIC.json
diff --git a/res/locales/isIC/game.json b/assets/locales/isIC/game.json
similarity index 100%
rename from res/locales/isIC/game.json
rename to assets/locales/isIC/game.json
diff --git a/res/locales/it/Polyglot-100_it.json b/assets/locales/it/Polyglot-100_it.json
similarity index 100%
rename from res/locales/it/Polyglot-100_it.json
rename to assets/locales/it/Polyglot-100_it.json
diff --git a/res/locales/it/game.json b/assets/locales/it/game.json
similarity index 100%
rename from res/locales/it/game.json
rename to assets/locales/it/game.json
diff --git a/res/locales/jaJP/Polyglot-100_jaJP.json b/assets/locales/jaJP/Polyglot-100_jaJP.json
similarity index 100%
rename from res/locales/jaJP/Polyglot-100_jaJP.json
rename to assets/locales/jaJP/Polyglot-100_jaJP.json
diff --git a/res/locales/jaJP/configurator.json b/assets/locales/jaJP/configurator.json
similarity index 100%
rename from res/locales/jaJP/configurator.json
rename to assets/locales/jaJP/configurator.json
diff --git a/res/locales/jaJP/devmsg.json b/assets/locales/jaJP/devmsg.json
similarity index 100%
rename from res/locales/jaJP/devmsg.json
rename to assets/locales/jaJP/devmsg.json
diff --git a/res/locales/jaJP/game.json b/assets/locales/jaJP/game.json
similarity index 100%
rename from res/locales/jaJP/game.json
rename to assets/locales/jaJP/game.json
diff --git a/res/locales/jaJP/tips.json b/assets/locales/jaJP/tips.json
similarity index 100%
rename from res/locales/jaJP/tips.json
rename to assets/locales/jaJP/tips.json
diff --git a/res/locales/jakanaJP/Polyglot-100_jakanaJP.json b/assets/locales/jakanaJP/Polyglot-100_jakanaJP.json
similarity index 100%
rename from res/locales/jakanaJP/Polyglot-100_jakanaJP.json
rename to assets/locales/jakanaJP/Polyglot-100_jakanaJP.json
diff --git a/res/locales/jakanaJP/game.json b/assets/locales/jakanaJP/game.json
similarity index 100%
rename from res/locales/jakanaJP/game.json
rename to assets/locales/jakanaJP/game.json
diff --git a/res/locales/koKR/Polyglot-100_koKR.json b/assets/locales/koKR/Polyglot-100_koKR.json
similarity index 100%
rename from res/locales/koKR/Polyglot-100_koKR.json
rename to assets/locales/koKR/Polyglot-100_koKR.json
diff --git a/res/locales/koKR/configurator.json b/assets/locales/koKR/configurator.json
similarity index 100%
rename from res/locales/koKR/configurator.json
rename to assets/locales/koKR/configurator.json
diff --git a/res/locales/koKR/devmsg.json b/assets/locales/koKR/devmsg.json
similarity index 100%
rename from res/locales/koKR/devmsg.json
rename to assets/locales/koKR/devmsg.json
diff --git a/res/locales/koKR/game.json b/assets/locales/koKR/game.json
similarity index 100%
rename from res/locales/koKR/game.json
rename to assets/locales/koKR/game.json
diff --git a/res/locales/koKR/tips.json b/assets/locales/koKR/tips.json
similarity index 100%
rename from res/locales/koKR/tips.json
rename to assets/locales/koKR/tips.json
diff --git a/res/locales/langprop.csv b/assets/locales/langprop.csv
similarity index 100%
rename from res/locales/langprop.csv
rename to assets/locales/langprop.csv
diff --git a/res/locales/nameset_russian_f.csv b/assets/locales/nameset_russian_f.csv
similarity index 100%
rename from res/locales/nameset_russian_f.csv
rename to assets/locales/nameset_russian_f.csv
diff --git a/res/locales/nameset_russian_m.csv b/assets/locales/nameset_russian_m.csv
similarity index 100%
rename from res/locales/nameset_russian_m.csv
rename to assets/locales/nameset_russian_m.csv
diff --git a/res/locales/nameset_scandinavian_f.csv b/assets/locales/nameset_scandinavian_f.csv
similarity index 100%
rename from res/locales/nameset_scandinavian_f.csv
rename to assets/locales/nameset_scandinavian_f.csv
diff --git a/res/locales/nameset_scandinavian_m.csv b/assets/locales/nameset_scandinavian_m.csv
similarity index 100%
rename from res/locales/nameset_scandinavian_m.csv
rename to assets/locales/nameset_scandinavian_m.csv
diff --git a/res/locales/nlNL/Polyglot-100_nlNL.json b/assets/locales/nlNL/Polyglot-100_nlNL.json
similarity index 100%
rename from res/locales/nlNL/Polyglot-100_nlNL.json
rename to assets/locales/nlNL/Polyglot-100_nlNL.json
diff --git a/res/locales/nlNL/game.json b/assets/locales/nlNL/game.json
similarity index 100%
rename from res/locales/nlNL/game.json
rename to assets/locales/nlNL/game.json
diff --git a/res/locales/noNB/Polyglot-100_noNB.json b/assets/locales/noNB/Polyglot-100_noNB.json
similarity index 100%
rename from res/locales/noNB/Polyglot-100_noNB.json
rename to assets/locales/noNB/Polyglot-100_noNB.json
diff --git a/res/locales/noNB/game.json b/assets/locales/noNB/game.json
similarity index 100%
rename from res/locales/noNB/game.json
rename to assets/locales/noNB/game.json
diff --git a/res/locales/plPL/Polyglot-100_plPL.json b/assets/locales/plPL/Polyglot-100_plPL.json
similarity index 100%
rename from res/locales/plPL/Polyglot-100_plPL.json
rename to assets/locales/plPL/Polyglot-100_plPL.json
diff --git a/res/locales/plPL/game.json b/assets/locales/plPL/game.json
similarity index 100%
rename from res/locales/plPL/game.json
rename to assets/locales/plPL/game.json
diff --git a/res/locales/ptBR/Polyglot-100_ptBR.json b/assets/locales/ptBR/Polyglot-100_ptBR.json
similarity index 100%
rename from res/locales/ptBR/Polyglot-100_ptBR.json
rename to assets/locales/ptBR/Polyglot-100_ptBR.json
diff --git a/res/locales/ptBR/game.json b/assets/locales/ptBR/game.json
similarity index 100%
rename from res/locales/ptBR/game.json
rename to assets/locales/ptBR/game.json
diff --git a/res/locales/ptPT/Polyglot-100_ptPT.json b/assets/locales/ptPT/Polyglot-100_ptPT.json
similarity index 100%
rename from res/locales/ptPT/Polyglot-100_ptPT.json
rename to assets/locales/ptPT/Polyglot-100_ptPT.json
diff --git a/res/locales/ptPT/game.json b/assets/locales/ptPT/game.json
similarity index 100%
rename from res/locales/ptPT/game.json
rename to assets/locales/ptPT/game.json
diff --git a/res/locales/roRO/Polyglot-100_roRO.json b/assets/locales/roRO/Polyglot-100_roRO.json
similarity index 100%
rename from res/locales/roRO/Polyglot-100_roRO.json
rename to assets/locales/roRO/Polyglot-100_roRO.json
diff --git a/res/locales/roRO/game.json b/assets/locales/roRO/game.json
similarity index 100%
rename from res/locales/roRO/game.json
rename to assets/locales/roRO/game.json
diff --git a/res/locales/ruRU/Polyglot-100_ruRU.json b/assets/locales/ruRU/Polyglot-100_ruRU.json
similarity index 100%
rename from res/locales/ruRU/Polyglot-100_ruRU.json
rename to assets/locales/ruRU/Polyglot-100_ruRU.json
diff --git a/res/locales/ruRU/game.json b/assets/locales/ruRU/game.json
similarity index 100%
rename from res/locales/ruRU/game.json
rename to assets/locales/ruRU/game.json
diff --git a/res/locales/svSE/Polyglot-100_svSE.json b/assets/locales/svSE/Polyglot-100_svSE.json
similarity index 100%
rename from res/locales/svSE/Polyglot-100_svSE.json
rename to assets/locales/svSE/Polyglot-100_svSE.json
diff --git a/res/locales/svSE/game.json b/assets/locales/svSE/game.json
similarity index 100%
rename from res/locales/svSE/game.json
rename to assets/locales/svSE/game.json
diff --git a/res/locales/thTH/Polyglot-100_thTH.json b/assets/locales/thTH/Polyglot-100_thTH.json
similarity index 100%
rename from res/locales/thTH/Polyglot-100_thTH.json
rename to assets/locales/thTH/Polyglot-100_thTH.json
diff --git a/res/locales/thTH/game.json b/assets/locales/thTH/game.json
similarity index 100%
rename from res/locales/thTH/game.json
rename to assets/locales/thTH/game.json
diff --git a/res/locales/tiles.csv b/assets/locales/tiles.csv
similarity index 100%
rename from res/locales/tiles.csv
rename to assets/locales/tiles.csv
diff --git a/res/locales/trTR/Polyglot-100_trTR.json b/assets/locales/trTR/Polyglot-100_trTR.json
similarity index 100%
rename from res/locales/trTR/Polyglot-100_trTR.json
rename to assets/locales/trTR/Polyglot-100_trTR.json
diff --git a/res/locales/trTR/game.json b/assets/locales/trTR/game.json
similarity index 100%
rename from res/locales/trTR/game.json
rename to assets/locales/trTR/game.json
diff --git a/res/locales/zhCN/Polyglot-100_zhCN.json b/assets/locales/zhCN/Polyglot-100_zhCN.json
similarity index 100%
rename from res/locales/zhCN/Polyglot-100_zhCN.json
rename to assets/locales/zhCN/Polyglot-100_zhCN.json
diff --git a/res/locales/zhCN/game.json b/assets/locales/zhCN/game.json
similarity index 100%
rename from res/locales/zhCN/game.json
rename to assets/locales/zhCN/game.json
diff --git a/res/locales/zhTW/Polyglot-100_zhTW.json b/assets/locales/zhTW/Polyglot-100_zhTW.json
similarity index 100%
rename from res/locales/zhTW/Polyglot-100_zhTW.json
rename to assets/locales/zhTW/Polyglot-100_zhTW.json
diff --git a/res/locales/zhTW/game.json b/assets/locales/zhTW/game.json
similarity index 100%
rename from res/locales/zhTW/game.json
rename to assets/locales/zhTW/game.json
diff --git a/res/raw/Creature_raw_doc.md b/assets/raw/Creature_raw_doc.md
similarity index 100%
rename from res/raw/Creature_raw_doc.md
rename to assets/raw/Creature_raw_doc.md
diff --git a/res/raw/Faction_doc.txt b/assets/raw/Faction_doc.txt
similarity index 100%
rename from res/raw/Faction_doc.txt
rename to assets/raw/Faction_doc.txt
diff --git a/res/raw/ReligionSphereRelations.csv b/assets/raw/ReligionSphereRelations.csv
similarity index 100%
rename from res/raw/ReligionSphereRelations.csv
rename to assets/raw/ReligionSphereRelations.csv
diff --git a/res/raw/creatures/CreatureHuman.json b/assets/raw/creatures/CreatureHuman.json
similarity index 100%
rename from res/raw/creatures/CreatureHuman.json
rename to assets/raw/creatures/CreatureHuman.json
diff --git a/res/raw/factions/FactionGenericPlayer.json b/assets/raw/factions/FactionGenericPlayer.json
similarity index 100%
rename from res/raw/factions/FactionGenericPlayer.json
rename to assets/raw/factions/FactionGenericPlayer.json
diff --git a/res/raw/factions/FactionSigrid.json b/assets/raw/factions/FactionSigrid.json
similarity index 100%
rename from res/raw/factions/FactionSigrid.json
rename to assets/raw/factions/FactionSigrid.json
diff --git a/res/raw/factions/FactionWildHamletTemplate.json b/assets/raw/factions/FactionWildHamletTemplate.json
similarity index 100%
rename from res/raw/factions/FactionWildHamletTemplate.json
rename to assets/raw/factions/FactionWildHamletTemplate.json
diff --git a/res/raw/weathers/WeatherGeneric.json b/assets/raw/weathers/WeatherGeneric.json
similarity index 100%
rename from res/raw/weathers/WeatherGeneric.json
rename to assets/raw/weathers/WeatherGeneric.json
diff --git a/res/raw/weathers/WeatherHellish.json b/assets/raw/weathers/WeatherHellish.json
similarity index 100%
rename from res/raw/weathers/WeatherHellish.json
rename to assets/raw/weathers/WeatherHellish.json
diff --git a/res/sounds/ambient/.gitattributes b/assets/sounds/ambient/.gitattributes
similarity index 100%
rename from res/sounds/ambient/.gitattributes
rename to assets/sounds/ambient/.gitattributes
diff --git a/res/sounds/ambient/ambient_forest_01.ogg b/assets/sounds/ambient/ambient_forest_01.ogg
similarity index 100%
rename from res/sounds/ambient/ambient_forest_01.ogg
rename to assets/sounds/ambient/ambient_forest_01.ogg
diff --git a/res/sounds/ambient/ambient_meadow_01.ogg b/assets/sounds/ambient/ambient_meadow_01.ogg
similarity index 100%
rename from res/sounds/ambient/ambient_meadow_01.ogg
rename to assets/sounds/ambient/ambient_meadow_01.ogg
diff --git a/res/sounds/ambient/ambient_windy_01.ogg b/assets/sounds/ambient/ambient_windy_01.ogg
similarity index 100%
rename from res/sounds/ambient/ambient_windy_01.ogg
rename to assets/sounds/ambient/ambient_windy_01.ogg
diff --git a/res/sounds/ambient/ambient_woods_01.ogg b/assets/sounds/ambient/ambient_woods_01.ogg
similarity index 100%
rename from res/sounds/ambient/ambient_woods_01.ogg
rename to assets/sounds/ambient/ambient_woods_01.ogg
diff --git a/res/sounds/ambient/crickets_01.ogg b/assets/sounds/ambient/crickets_01.ogg
similarity index 100%
rename from res/sounds/ambient/crickets_01.ogg
rename to assets/sounds/ambient/crickets_01.ogg
diff --git a/res/sounds/ambient/crickets_02.ogg b/assets/sounds/ambient/crickets_02.ogg
similarity index 100%
rename from res/sounds/ambient/crickets_02.ogg
rename to assets/sounds/ambient/crickets_02.ogg
diff --git a/res/graphics/fonts/thai_fullwidth.png b/res/graphics/fonts/thai_fullwidth.png
deleted file mode 100644
index abff042a9..000000000
Binary files a/res/graphics/fonts/thai_fullwidth.png and /dev/null differ
diff --git a/res/musicbox_test/dragonborn.mid b/res/musicbox_test/dragonborn.mid
deleted file mode 100755
index 90e219069..000000000
Binary files a/res/musicbox_test/dragonborn.mid and /dev/null differ
diff --git a/src/net/torvald/colourutil/ColourTemp.kt b/src/net/torvald/colourutil/ColourTemp.kt
index d6e6998ac..9ae7b06b6 100644
--- a/src/net/torvald/colourutil/ColourTemp.kt
+++ b/src/net/torvald/colourutil/ColourTemp.kt
@@ -7,7 +7,7 @@ import org.newdawn.slick.Image
  * Created by minjaesong on 16-07-26.
  */
 object ColourTemp {
-    private var envOverlayColourmap = Image("./res/graphics/colourmap/black_body_col_1000_40000_K.png")
+    private var envOverlayColourmap = Image("./assets/graphics/colourmap/black_body_col_1000_40000_K.png")
 
     private fun colTempToImagePos(K: Int): Int {
         if (K < 1000 || K >= 40000) throw IllegalArgumentException("K: out of range. ($K)")
diff --git a/src/net/torvald/imagefont/GameFontWhite.kt b/src/net/torvald/imagefont/GameFontWhite.kt
index 232461064..aba08f639 100644
--- a/src/net/torvald/imagefont/GameFontWhite.kt
+++ b/src/net/torvald/imagefont/GameFontWhite.kt
@@ -12,50 +12,50 @@ constructor() : GameFontBase() {
     init {
 
         GameFontBase.hangulSheet = SpriteSheet(
-                "./res/graphics/fonts/han_johab.png", GameFontBase.W_CJK, GameFontBase.H_HANGUL)
+                "./assets/graphics/fonts/han_johab.png", GameFontBase.W_CJK, GameFontBase.H_HANGUL)
         GameFontBase.asciiSheet = SpriteSheet(
-                "./res/graphics/fonts/ascii_fullwidth.png", GameFontBase.W_LATIN_WIDE, GameFontBase.H)
+                "./assets/graphics/fonts/ascii_fullwidth.png", GameFontBase.W_LATIN_WIDE, GameFontBase.H)
         GameFontBase.asciiSheetEF = SpriteSheet(
-                "./res/graphics/fonts/ascii_special_ef.png", GameFontBase.W_LATIN_NARROW, GameFontBase.H)
+                "./assets/graphics/fonts/ascii_special_ef.png", GameFontBase.W_LATIN_NARROW, GameFontBase.H)
         GameFontBase.runicSheet = SpriteSheet(
-                "./res/graphics/fonts/futhark.png", GameFontBase.W_LATIN_WIDE, GameFontBase.H)
+                "./assets/graphics/fonts/futhark.png", GameFontBase.W_LATIN_WIDE, GameFontBase.H)
         GameFontBase.extASheet = SpriteSheet(
-                "./res/graphics/fonts/LatinExtA_fullwidth.png", GameFontBase.W_LATIN_WIDE, GameFontBase.H)
+                "./assets/graphics/fonts/LatinExtA_fullwidth.png", GameFontBase.W_LATIN_WIDE, GameFontBase.H)
         GameFontBase.extASheetEF = SpriteSheet(
-                "./res/graphics/fonts/LatinExtA_ef.png", GameFontBase.W_LATIN_NARROW, GameFontBase.H)
+                "./assets/graphics/fonts/LatinExtA_ef.png", GameFontBase.W_LATIN_NARROW, GameFontBase.H)
         GameFontBase.kanaSheet = SpriteSheet(
-                "./res/graphics/fonts/kana.png", GameFontBase.W_CJK, GameFontBase.H_KANA)
+                "./assets/graphics/fonts/kana.png", GameFontBase.W_CJK, GameFontBase.H_KANA)
         GameFontBase.cjkPunct = SpriteSheet(
-                "./res/graphics/fonts/cjkpunct.png", GameFontBase.W_CJK, GameFontBase.H_KANA)
+                "./assets/graphics/fonts/cjkpunct.png", GameFontBase.W_CJK, GameFontBase.H_KANA)
         /*uniHan = new SpriteSheet(
-                "./res/graphics/fonts/unifont_unihan"
+                "./assets/graphics/fonts/unifont_unihan"
                         + ((!terrarum.gameLocale.contains("zh"))
                         ? "_ja" : "")
                         +".png"
                 , W_UNIHAN, H_UNIHAN
         );*/
         GameFontBase.cyrilic = SpriteSheet(
-                "./res/graphics/fonts/cyrilic_fullwidth.png", GameFontBase.W_LATIN_WIDE, GameFontBase.H)
+                "./assets/graphics/fonts/cyrilic_fullwidth.png", GameFontBase.W_LATIN_WIDE, GameFontBase.H)
         GameFontBase.cyrilicEF = SpriteSheet(
-                "./res/graphics/fonts/cyrilic_ef.png", GameFontBase.W_LATIN_NARROW, GameFontBase.H)
+                "./assets/graphics/fonts/cyrilic_ef.png", GameFontBase.W_LATIN_NARROW, GameFontBase.H)
         GameFontBase.fullwidthForms = SpriteSheet(
-                "./res/graphics/fonts/fullwidth_forms.png", GameFontBase.W_UNIHAN, GameFontBase.H_UNIHAN)
+                "./assets/graphics/fonts/fullwidth_forms.png", GameFontBase.W_UNIHAN, GameFontBase.H_UNIHAN)
         GameFontBase.uniPunct = SpriteSheet(
-                "./res/graphics/fonts/unipunct.png", GameFontBase.W_LATIN_WIDE, GameFontBase.H)
+                "./assets/graphics/fonts/unipunct.png", GameFontBase.W_LATIN_WIDE, GameFontBase.H)
         GameFontBase.wenQuanYi_1 = SpriteSheet(
-                "./res/graphics/fonts/wenquanyi_11pt_part1.png", 16, 18, 2)
+                "./assets/graphics/fonts/wenquanyi_11pt_part1.png", 16, 18, 2)
         GameFontBase.wenQuanYi_2 = SpriteSheet(
-                "./res/graphics/fonts/wenquanyi_11pt_part2.png", 16, 18, 2)
+                "./assets/graphics/fonts/wenquanyi_11pt_part2.png", 16, 18, 2)
         GameFontBase.greekSheet = SpriteSheet(
-                "./res/graphics/fonts/greek_fullwidth.png", GameFontBase.W_LATIN_WIDE, GameFontBase.H)
+                "./assets/graphics/fonts/greek_fullwidth.png", GameFontBase.W_LATIN_WIDE, GameFontBase.H)
         GameFontBase.greekSheetEF = SpriteSheet(
-                "./res/graphics/fonts/greek_ef.png", GameFontBase.W_LATIN_NARROW, GameFontBase.H)
+                "./assets/graphics/fonts/greek_ef.png", GameFontBase.W_LATIN_NARROW, GameFontBase.H)
         GameFontBase.romanianSheet = SpriteSheet(
-                "./res/graphics/fonts/romana_fullwidth.png", GameFontBase.W_LATIN_WIDE, GameFontBase.H)
+                "./assets/graphics/fonts/romana_fullwidth.png", GameFontBase.W_LATIN_WIDE, GameFontBase.H)
         GameFontBase.romanianSheetEF = SpriteSheet(
-                "./res/graphics/fonts/romana_ef.png", GameFontBase.W_LATIN_NARROW, GameFontBase.H)
+                "./assets/graphics/fonts/romana_ef.png", GameFontBase.W_LATIN_NARROW, GameFontBase.H)
         GameFontBase.thaiSheet = SpriteSheet(
-                "./res/graphics/fonts/thai_fullwidth.png", GameFontBase.W_LATIN_WIDE, GameFontBase.H)
+                "./assets/graphics/fonts/thai_fullwidth.png", GameFontBase.W_LATIN_WIDE, GameFontBase.H)
 
         val shk = arrayOf(
                 GameFontBase.asciiSheet,
diff --git a/src/net/torvald/imagefont/TinyAlphNum.kt b/src/net/torvald/imagefont/TinyAlphNum.kt
index 44f9d83de..3d55c4862 100644
--- a/src/net/torvald/imagefont/TinyAlphNum.kt
+++ b/src/net/torvald/imagefont/TinyAlphNum.kt
@@ -28,7 +28,7 @@ class TinyAlphNum : Font {
     private val mappingTable = HashMap<Int, Int>()
 
     init {
-        fontSheet = SpriteSheet("./res/graphics/fonts/alphanumeric_small.png", W, H)
+        fontSheet = SpriteSheet("./assets/graphics/fonts/alphanumeric_small.png", W, H)
         chars.forEachIndexed { i, c -> mappingTable[c.toInt()] = i }
     }
 
diff --git a/src/net/torvald/terrarum/DefaultConfig.kt b/src/net/torvald/terrarum/DefaultConfig.kt
index 26c2645a6..9cdf62580 100644
--- a/src/net/torvald/terrarum/DefaultConfig.kt
+++ b/src/net/torvald/terrarum/DefaultConfig.kt
@@ -56,7 +56,7 @@ object DefaultConfig {
         val keyquickbars = JsonArray(); for (i in 2..11) keyquickbars.add(i) // NUM_1 to NUM_0
         jsonObject.add("keyquickbars", keyquickbars)
 
-
+        jsonObject.addProperty("pcgamepadenv", "console")
 
 
         return jsonObject
diff --git a/src/net/torvald/terrarum/StateFontTester.kt b/src/net/torvald/terrarum/StateFontTester.kt
index 2a8a552fc..179b18a15 100644
--- a/src/net/torvald/terrarum/StateFontTester.kt
+++ b/src/net/torvald/terrarum/StateFontTester.kt
@@ -1,5 +1,6 @@
 package net.torvald.terrarum
 
+import net.torvald.imagefont.GameFontWhite
 import org.newdawn.slick.Font
 import org.newdawn.slick.GameContainer
 import org.newdawn.slick.Graphics
@@ -17,6 +18,8 @@ class StateFontTester : BasicGameState() {
 
     override fun init(gc: GameContainer, game: StateBasedGame) {
         canvas = Graphics(1024, 1024)
+
+        gameFont = GameFontWhite()
     }
 
     override fun update(gc: GameContainer, game: StateBasedGame, delta: Int) {
@@ -24,7 +27,8 @@ class StateFontTester : BasicGameState() {
     }
 
     override fun render(gc: GameContainer, game: StateBasedGame, g: Graphics) {
-
+        g.font = gameFont
+        g.drawString(textToPrint, 10f, 10f)
     }
 
     override fun getID(): Int = Terrarum.SCENE_ID_TEST_FONT
diff --git a/src/net/torvald/terrarum/StateInGame.kt b/src/net/torvald/terrarum/StateInGame.kt
index 73fc3445a..e72caa8fc 100644
--- a/src/net/torvald/terrarum/StateInGame.kt
+++ b/src/net/torvald/terrarum/StateInGame.kt
@@ -94,9 +94,9 @@ constructor() : BasicGameState() {
     @Throws(SlickException::class)
     override fun init(gameContainer: GameContainer, stateBasedGame: StateBasedGame) {
         // load necessary shaders
-        shader12BitCol = Shader.makeShader("./res/4096.vrt", "./res/4096.frg")
-        shaderBlurH = Shader.makeShader("./res/blurH.vrt", "./res/blur.frg")
-        shaderBlurV = Shader.makeShader("./res/blurV.vrt", "./res/blur.frg")
+        shader12BitCol = Shader.makeShader("./assets/4096.vrt", "./assets/4096.frg")
+        shaderBlurH = Shader.makeShader("./assets/blurH.vrt", "./assets/blur.frg")
+        shaderBlurV = Shader.makeShader("./assets/blurV.vrt", "./assets/blur.frg")
 
         // init map as chosen size
         world = GameWorld(8192, 2048)
diff --git a/src/net/torvald/terrarum/Terrarum.kt b/src/net/torvald/terrarum/Terrarum.kt
index 1a0b7d443..b87c0a13a 100644
--- a/src/net/torvald/terrarum/Terrarum.kt
+++ b/src/net/torvald/terrarum/Terrarum.kt
@@ -46,6 +46,17 @@ constructor(gamename: String) : StateBasedGame(gamename) {
             gameLocale = gameLocaleFromConfig
 
         println("[terrarum] Locale: " + gameLocale)
+
+        try {
+            Controllers.getController(0)
+            environment = if (getConfigString("pcgamepadenv") == "console")
+                RunningEnvironment.CONSOLE
+            else
+                RunningEnvironment.PC
+        }
+        catch (e: IndexOutOfBoundsException) {
+            environment = RunningEnvironment.PC
+        }
     }
 
     @Throws(SlickException::class)
@@ -63,8 +74,8 @@ constructor(gamename: String) : StateBasedGame(gamename) {
         }
 
         ingame = StateInGame()
-        addState(ingame)
-        //addState(StateMonitorCheck())
+        //addState(ingame)
+        addState(StateMonitorCheck())
     }
 
     companion object {
@@ -111,6 +122,8 @@ constructor(gamename: String) : StateBasedGame(gamename) {
         lateinit var defaultSaveDir: String
             private set
 
+        lateinit var environment: RunningEnvironment
+
         private val localeSimple = arrayOf("de", "en", "es", "it")
         var gameLocale = "####" // locale override
             set(value) {
@@ -335,9 +348,9 @@ constructor(gamename: String) : StateBasedGame(gamename) {
 
         private fun getConfigMaster(key: String): Any {
             var cfg: Any? = null
-            try { cfg = gameConfig[key]!! }
+            try { cfg = gameConfig[key.toLowerCase()]!! }
             catch (e: NullPointerException) {
-                try { cfg = DefaultConfig.fetch()[key] }
+                try { cfg = DefaultConfig.fetch()[key.toLowerCase()] }
                 catch (e1: NullPointerException) { e.printStackTrace() }
             }
             return cfg!!
@@ -372,3 +385,7 @@ fun setBlendScreen() {
 fun setBlendDisable() {
     GL11.glDisable(GL11.GL_BLEND)
 }
+
+enum class RunningEnvironment {
+    PC, CONSOLE, MOBILE
+}
\ No newline at end of file
diff --git a/src/net/torvald/terrarum/audio/AudioMixer.kt b/src/net/torvald/terrarum/audio/AudioMixer.kt
index 7eeef68e2..0287d1555 100644
--- a/src/net/torvald/terrarum/audio/AudioMixer.kt
+++ b/src/net/torvald/terrarum/audio/AudioMixer.kt
@@ -1,9 +1,12 @@
 package net.torvald.terrarum.audio
 
+import org.lwjgl.BufferUtils
 import org.lwjgl.openal.AL10
+import org.newdawn.slick.Music
 import org.newdawn.slick.openal.Audio
 import org.newdawn.slick.openal.AudioImpl
 import org.newdawn.slick.openal.MODSound
+import org.newdawn.slick.openal.StreamSound
 import java.util.*
 
 /**
@@ -12,10 +15,10 @@ import java.util.*
 object AudioMixer {
     const val TRACK_COUNT = 32
 
-    const val TRACK_AMBIENT_ONE = 0
-    const val TRACK_AMBIENT_ONE_NEXT = 1
-    const val TRACK_AMBIENT_TWO = 2
-    const val TRACK_AMBIENT_TWO_NEXT = 3
+    const val TRACK_AMBIENT_ONE = 0 // music track one
+    const val TRACK_AMBIENT_ONE_NEXT = 1 // music track two
+    const val TRACK_AMBIENT_TWO = 2 // music track three
+    const val TRACK_AMBIENT_TWO_NEXT = 3 // music track four
 
     const val TRACK_UI_ONE = 8
     const val TRACK_UI_TWO = 9
@@ -23,14 +26,18 @@ object AudioMixer {
     const val TRACK_SFX_START = 16
     const val TRACK_SFX_END = 31
 
-    val tracks = ArrayList<MixerTrack>(TRACK_COUNT)
+    val tracks = ArrayList<Int>(TRACK_COUNT) // stores index of ALSource
 
     init {
-
+        tracks[TRACK_AMBIENT_ONE]
     }
 
     fun getAudio(track: Int) = tracks[track]
 
+    fun play(channel: Int) {
+
+    }
+
     /**
      * Queue an SFX to any empty SFX track and play it.
      */
@@ -38,11 +45,12 @@ object AudioMixer {
 
     }
 
-    fun update() {
+    fun update(delta: Int) {
 
     }
 
+
     class MixerTrack(val audio: Audio, var volume: Float, var pan: Float) {
 
     }
-}
\ No newline at end of file
+}
diff --git a/src/net/torvald/terrarum/audio/AudioResourceLibrary.kt b/src/net/torvald/terrarum/audio/AudioResourceLibrary.kt
index 566be4a3b..68e5d89e0 100644
--- a/src/net/torvald/terrarum/audio/AudioResourceLibrary.kt
+++ b/src/net/torvald/terrarum/audio/AudioResourceLibrary.kt
@@ -2,6 +2,7 @@ package net.torvald.terrarum.audio
 
 import org.newdawn.slick.openal.Audio
 import org.newdawn.slick.openal.AudioLoader
+import java.io.File
 import java.io.FileInputStream
 import java.util.*
 
@@ -10,22 +11,25 @@ import java.util.*
  */
 object AudioResourceLibrary {
 
+    // will play as music
     val ambientsForest = ArrayList<Audio>()
     val ambientsMeadow = ArrayList<Audio>()
     val ambientsWindy = ArrayList<Audio>()
     val ambientsWoods = ArrayList<Audio>()
+
+    // will play as sound effect
     val crickets = ArrayList<Audio>()
 
     init {
-        ambientsForest.add(AudioLoader.getAudio("ogg", FileInputStream("./res/sounds/ambient/ambient_forest_01.ogg")))
+        ambientsForest.add(AudioLoader.getStreamingAudio("OGG", File("./assets/sounds/ambient/ambient_forest_01.ogg").toURI().toURL()))
 
-        ambientsMeadow.add(AudioLoader.getAudio("ogg", FileInputStream("./res/sounds/ambient/ambient_meadow_01.ogg")))
+        ambientsMeadow.add(AudioLoader.getStreamingAudio("OGG", File("./assets/sounds/ambient/ambient_meadow_01.ogg").toURI().toURL()))
 
-        ambientsWindy.add(AudioLoader.getAudio("ogg", FileInputStream("./res/sounds/ambient/ambient_windy_01.ogg")))
+        ambientsWindy.add(AudioLoader.getStreamingAudio("OGG", File("./assets/sounds/ambient/ambient_windy_01.ogg").toURI().toURL()))
 
-        ambientsWoods.add(AudioLoader.getAudio("ogg", FileInputStream("./res/sounds/ambient/ambient_woods_01.ogg")))
+        ambientsWoods.add(AudioLoader.getStreamingAudio("OGG", File("./assets/sounds/ambient/ambient_woods_01.ogg").toURI().toURL()))
 
-        crickets.add(AudioLoader.getAudio("ogg", FileInputStream("./res/sounds/ambient/crickets_01.ogg")))
-        crickets.add(AudioLoader.getAudio("ogg", FileInputStream("./res/sounds/ambient/crickets_02.ogg")))
+        crickets.add(AudioLoader.getAudio("OGG", FileInputStream("./assets/sounds/ambient/crickets_01.ogg")))
+        crickets.add(AudioLoader.getAudio("OGG", FileInputStream("./assets/sounds/ambient/crickets_02.ogg")))
     }
 }
\ No newline at end of file
diff --git a/src/net/torvald/terrarum/console/CommandDict.kt b/src/net/torvald/terrarum/console/CommandDict.kt
index ca241f491..bd24e2a21 100644
--- a/src/net/torvald/terrarum/console/CommandDict.kt
+++ b/src/net/torvald/terrarum/console/CommandDict.kt
@@ -43,7 +43,8 @@ object CommandDict {
             Pair("bulletintest", SetBulletin()),
             Pair("gsontest", GsonTest()),
             Pair("tips", PrintRandomTips()),
-            Pair("langtest", LangTest())
+            Pair("langtest", LangTest()),
+            Pair("musictest", MusicTest())
     )
 
     operator fun get(commandName: String): ConsoleCommand {
diff --git a/src/net/torvald/terrarum/console/MusicTest.kt b/src/net/torvald/terrarum/console/MusicTest.kt
new file mode 100644
index 000000000..47e18e06b
--- /dev/null
+++ b/src/net/torvald/terrarum/console/MusicTest.kt
@@ -0,0 +1,45 @@
+package net.torvald.terrarum.console
+
+import org.newdawn.slick.Music
+import org.newdawn.slick.openal.AudioLoader
+import java.io.File
+
+/**
+ * Created by minjaesong on 16-08-02.
+ */
+class MusicTest : ConsoleCommand {
+
+    var music: Music? = null
+
+    /**
+     * Args 0: command given
+     * Args 1: first argument
+     *
+     * e.g. in ```setav mass 74```, zeroth args will be ```setav```.
+     */
+    override fun execute(args: Array<String>) {
+        if (args.size < 2) {
+            printUsage()
+            return
+        }
+
+        if (args[1] == "stop") {
+            music!!.stop()
+            return
+        }
+
+        val type = args[1].substringAfter('.').toUpperCase()
+        /*AudioLoader.getStreamingAudio(
+                type,
+                File("./assets/sounds/test/${args[1]}").absoluteFile.toURI().toURL()
+        ).playAsMusic(1f, 1f, false)*/
+
+        music = Music("./assets/sounds/test/${args[1]}")
+        music!!.play()
+    }
+
+    override fun printUsage() {
+        Echo().execute("Usage: musictest filename/in/res/sounds/test")
+        Echo().execute("musictest stop to stop playback")
+    }
+}
\ No newline at end of file
diff --git a/src/net/torvald/terrarum/gameactors/ActorWithBody.kt b/src/net/torvald/terrarum/gameactors/ActorWithBody.kt
index 5e82ebe3b..bd4586951 100644
--- a/src/net/torvald/terrarum/gameactors/ActorWithBody.kt
+++ b/src/net/torvald/terrarum/gameactors/ActorWithBody.kt
@@ -112,6 +112,8 @@ open class ActorWithBody : Actor(), Visible {
         set(value) { elasticity = 1.0 - value }
         get() = 1.0 - elasticity
 
+    @Transient private val CEILING_HIT_ELASTICITY = 0.3
+
     var density = 1000.0
         set(value) {
             if (value < 0)
@@ -374,7 +376,7 @@ open class ActorWithBody : Actor(), Visible {
      * Apply only if not grounded; normal force is precessed separately.
      */
     private fun applyGravitation() {
-        if (!isTouchingSide(hitbox, COLLIDING_BOTTOM)) {//(!isColliding(COLLIDING_BOTTOM)) { // or !grounded
+        if (!isTouchingSide(hitbox, COLLIDING_BOTTOM)) {
             /**
              * weight; gravitational force in action
              * W = mass * G (9.8 [m/s^2])
@@ -388,7 +390,7 @@ open class ActorWithBody : Actor(), Visible {
              * Drag of atmosphere
              * D = Cd (drag coefficient) * 0.5 * rho (density) * V^2 (velocity sqr) * A (area)
              */
-            val D: Vector2 = velocity * DRAG_COEFF * 0.5 * A// * tileDensityFluid.toDouble()
+            val D: Vector2 = Vector2(veloX.magnSqr(), veloY.magnSqr()) * DRAG_COEFF * 0.5 * A// * tileDensityFluid.toDouble()
 
             val V: Vector2 = (W - D) / mass * SI_TO_GAME_ACC
 
@@ -398,9 +400,13 @@ open class ActorWithBody : Actor(), Visible {
 
     private fun applyNormalForce() {
         if (!isNoCollideWorld) {
-            // axis Y. Use operand >=
-            if (moveDelta.y >= 0.0) { // was moving downward?
-                if (isColliding(nextHitbox)) { // FIXME if standing: standard box, if walking: top-squished box
+            // axis Y. Using operand >= and hitting the ceiling will lock the player to the position
+            if (moveDelta.y > 0.0) { // was moving downward?
+                if (isColliding(nextHitbox, COLLIDING_TOP)) { // hit the ceiling
+                    hitAndForciblyReflectY()
+                    grounded = false
+                }
+                else if (isColliding(nextHitbox)) { // FIXME if standing: standard box, if walking: top-squished box
                     hitAndReflectY()
                     grounded = true
                 }
@@ -415,7 +421,7 @@ open class ActorWithBody : Actor(), Visible {
             else if (moveDelta.y < 0.0) { // or was moving upward?
                 grounded = false
                 if (isTouchingSide(nextHitbox, COLLIDING_TOP)) { // actor hit something on its top
-                    hitAndReflectY()
+                    hitAndForciblyReflectY()
                 }
                 else { // the actor is not grounded at all
                 }
@@ -478,6 +484,13 @@ open class ActorWithBody : Actor(), Visible {
         }
     }
 
+    private fun hitAndForciblyReflectY() {
+        if (veloY.abs() * CEILING_HIT_ELASTICITY > A_PIXEL)
+            veloY = -veloY * CEILING_HIT_ELASTICITY
+        else
+            veloY = veloY.sign() * -A_PIXEL
+    }
+
     private fun isColliding(hitbox: Hitbox) = isColliding(hitbox, 0)
 
     private fun isColliding(hitbox: Hitbox, option: Int): Boolean {
@@ -915,33 +928,6 @@ open class ActorWithBody : Actor(), Visible {
     private val AUTO_CLIMB_RATE: Int
         get() = Math.min(TSIZE / 8 * Math.sqrt(scale), TSIZE.toDouble()).toInt()
 
-    fun Double.floorInt() = Math.floor(this).toInt()
-    fun Double.round() = Math.round(this).toDouble()
-    fun Double.floor() = Math.floor(this)
-    fun Double.ceil() = this.floor() + 1.0
-    fun Double.roundInt(): Int = Math.round(this).toInt()
-    fun Double.abs() = Math.abs(this)
-    fun Double.sqr() = this * this
-    fun Int.abs() = if (this < 0) -this else this
-    fun Double.bipolarClamp(limit: Double) =
-            if      (this > 0 && this > limit)   limit
-            else if (this < 0 && this < -limit) -limit
-            else this
-    fun absMax(left: Double, right: Double): Double {
-        if (left > 0 && right > 0)
-            if (left > right) return left
-            else              return right
-        else if (left < 0 && right < 0)
-            if (left < right) return left
-            else              return right
-        else {
-            val absL = left.abs()
-            val absR = right.abs()
-            if (absL > absR) return left
-            else             return right
-        }
-    }
-
     private fun assertInit() {
         // errors
         if (baseHitboxW == 0 || baseHitboxH == 0)
@@ -983,3 +969,32 @@ open class ActorWithBody : Actor(), Visible {
         }
     }
 }
+
+fun Double.floorInt() = Math.floor(this).toInt()
+fun Double.round() = Math.round(this).toDouble()
+fun Double.floor() = Math.floor(this)
+fun Double.ceil() = this.floor() + 1.0
+fun Double.roundInt(): Int = Math.round(this).toInt()
+fun Double.abs() = Math.abs(this)
+fun Double.sqr() = this * this
+fun Int.abs() = if (this < 0) -this else this
+fun Double.bipolarClamp(limit: Double) =
+        if      (this > 0 && this > limit)   limit
+        else if (this < 0 && this < -limit) -limit
+        else this
+fun absMax(left: Double, right: Double): Double {
+    if (left > 0 && right > 0)
+        if (left > right) return left
+        else              return right
+    else if (left < 0 && right < 0)
+        if (left < right) return left
+        else              return right
+    else {
+        val absL = left.abs()
+        val absR = right.abs()
+        if (absL > absR) return left
+        else             return right
+    }
+}
+fun Double.magnSqr() = if (this >= 0.0) this.sqr() else -this.sqr()
+fun Double.sign() = if (this > 0.0) 1.0 else if (this < 0.0) -1.0 else 0.0
\ No newline at end of file
diff --git a/src/net/torvald/terrarum/gameactors/MDLInterpreterState.kt b/src/net/torvald/terrarum/gameactors/MDLInterpreterState.kt
new file mode 100644
index 000000000..08e46aa07
--- /dev/null
+++ b/src/net/torvald/terrarum/gameactors/MDLInterpreterState.kt
@@ -0,0 +1,166 @@
+package net.torvald.terrarum.gameactors
+
+import net.torvald.terrarum.mapgenerator.RoguelikeRandomiser
+import java.util.*
+
+/**
+ * Provides MDL interpretation, pre-compilation and stores state of the interpreter
+ *
+ * Created by minjaesong on 16-07-30.
+ */
+class MDLInterpreterState {
+    val stack = MagicArrayStack(20)
+
+    fun interpret(line: String) {
+
+    }
+
+    fun execute(property: MagicWords, power: MagicWords? = null, arg: Int? = null) {
+
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    enum class MagicWords {
+        // properties
+        ELDR, IS, STORMR, HREYFING, LAEKNING, GLEYPI, TJON,
+        //fire, ice, storm, kinesis,    heal, absorb, harm
+        // reserved words
+        LAEKNINGHRADI, HREYFINGHRADI, LAEKNINGAUKI, HREYFINGAUKI, STOEKKAUKI, HEILSASTIG,
+        //  heal rate,movement speed, healratemult,movespeedmult, jump boost, health point
+        // adjectives (power)
+
+        // operators
+        ITA, POP, PLUS, MINUS, SINNUM, DEILING, LEIFASTOFN, AFRIT, TALASKIPTI, HENDA
+        // push, pop, +,    -,      *,       /,          %,   dup,       swap,  drop
+    }
+
+    class MagicOrInt() {
+        private var magic: MagicWords? = null
+        private var number: Int? = null
+
+        constructor(kynngi: MagicWords): this() {
+            magic = kynngi
+        }
+
+        constructor(integer: Int) : this() {
+            number = integer
+        }
+
+        fun toMagic() = if (magic != null) magic!! else throw TypeCastException("$this: cannot be cast to MagicWord")
+        fun toInt() = if (number != null) number!! else throw TypeCastException("$this: cannot be cast to MagicWord")
+
+        fun isMagic() = (magic != null)
+        fun isInt() = (number != null)
+
+        override fun toString(): String = if (magic != null && number == null) "$magic" else if (magic == null && number != null) "$number" else "INVALID"
+    }
+
+    class MagicArrayStack {
+        /**
+         * Number of elements in the stack
+         */
+        var depth: Int = 0
+            private set
+
+        var size: Int
+            get() = data.size
+            set(newSize) {
+                if (newSize > depth) inflate(newSize - data.size)
+                else                 deflate(data.size - newSize)
+            }
+
+        private lateinit var data: Array<MagicOrInt?>
+
+        constructor(stackSize: Int) {
+            data = Array(stackSize, { null })
+        }
+
+        constructor(arr: Array<MagicOrInt?>) {
+            data = arr.copyOf()
+            depth = size
+        }
+
+        fun push(v: MagicOrInt) {
+            if (depth >= data.size) throw StackOverflowError()
+            data[depth++] = v
+        }
+
+        fun pop(): MagicOrInt {
+            if (depth == 0) throw EmptyStackException()
+            return data[--depth]!!
+        }
+
+        fun peek(): MagicOrInt? {
+            if (depth == 0) return null
+            return data[depth - 1]
+        }
+
+        fun dup() {
+            if (depth == 0)         throw EmptyStackException()
+            if (depth == data.size) throw StackOverflowError()
+            push(peek()!!)
+        }
+
+        fun swap() {
+            if (depth < 2) throw UnsupportedOperationException("Stack is empty or has only one element.")
+            val up = pop()
+            val dn = pop()
+            push(up)
+            push(dn)
+        }
+
+        fun drop() {
+            if (depth == 0) throw EmptyStackException()
+            --depth
+        }
+
+        fun defineFromArray(arr: Array<MagicOrInt?>) { data = arr.copyOf() }
+
+        /**
+         * Increase the stack size by a factor.
+         */
+        fun inflate(sizeToAdd: Int) {
+            if (sizeToAdd < 0) throw UnsupportedOperationException("$sizeToAdd: Cannot deflate the stack with this function. Use deflate(int) instead.")
+            size += sizeToAdd
+            val oldStack = this.asArray()
+            data = Array(size, { if (it < oldStack.size) oldStack[it] else null })
+        }
+
+        /**
+         * Decrease the stack size by a factor. Overflowing data will be removed.
+         */
+        fun deflate(sizeToTake: Int) {
+            if (size - sizeToTake < 1) throw UnsupportedOperationException("$sizeToTake: Cannot deflate the stack to the size of zero or negative.")
+            size -= sizeToTake
+            val oldStack = this.asArray()
+            data = Array(size, { oldStack[it] })
+            if (depth > data.size) depth = data.size
+        }
+
+        /**
+         * Convert stack as array. Index zero is the bottommost element.
+         * @return array of data, with array size equivalent to the stack depth.
+         */
+        fun asArray() = data.copyOfRange(0, depth - 1)
+
+        fun equalTo(other: MagicArrayStack) = (this.asArray() == other.asArray())
+
+        fun plus()  { if (data[depth - 2]!!.isInt() && peek()!!.isInt()) data[depth - 2] = MagicOrInt(data[depth - 2]!!.toInt() + (pop().toInt())) else throw RuntimeException("${data[depth - 2]}: Cannot do arithmetic operation on non-numeric type.") }
+        fun minus() { if (data[depth - 2]!!.isInt() && peek()!!.isInt()) data[depth - 2] = MagicOrInt(data[depth - 2]!!.toInt() - (pop().toInt())) else throw RuntimeException("${data[depth - 2]}: Cannot do arithmetic operation on non-numeric type.") }
+        fun times() { if (data[depth - 2]!!.isInt() && peek()!!.isInt()) data[depth - 2] = MagicOrInt(data[depth - 2]!!.toInt() * (pop().toInt())) else throw RuntimeException("${data[depth - 2]}: Cannot do arithmetic operation on non-numeric type.") }
+        fun div()   { if (data[depth - 2]!!.isInt() && peek()!!.isInt()) data[depth - 2] = MagicOrInt(data[depth - 2]!!.toInt() / (pop().toInt())) else throw RuntimeException("${data[depth - 2]}: Cannot do arithmetic operation on non-numeric type.") }
+        fun mod()   { if (data[depth - 2]!!.isInt() && peek()!!.isInt()) data[depth - 2] = MagicOrInt(data[depth - 2]!!.toInt() % (pop().toInt())) else throw RuntimeException("${data[depth - 2]}: Cannot do arithmetic operation on non-numeric type.") }
+    }
+}
\ No newline at end of file
diff --git a/src/net/torvald/terrarum/gameactors/PBCynthia.kt b/src/net/torvald/terrarum/gameactors/PBCynthia.kt
index f89c25b1b..bfae41fad 100644
--- a/src/net/torvald/terrarum/gameactors/PBCynthia.kt
+++ b/src/net/torvald/terrarum/gameactors/PBCynthia.kt
@@ -16,7 +16,7 @@ object PBCynthia {
 
         p.sprite = SpriteAnimation()
         p.sprite!!.setDimension(26, 42)
-        p.sprite!!.setSpriteImage("res/graphics/sprites/test_player_2.png")
+        p.sprite!!.setSpriteImage("assets/graphics/sprites/test_player_2.png")
         p.sprite!!.setDelay(200)
         p.sprite!!.setRowsAndFrames(1, 1)
         p.sprite!!.setAsVisible()
diff --git a/src/net/torvald/terrarum/gameactors/PBSigrid.kt b/src/net/torvald/terrarum/gameactors/PBSigrid.kt
index bc880c826..93aa73f98 100644
--- a/src/net/torvald/terrarum/gameactors/PBSigrid.kt
+++ b/src/net/torvald/terrarum/gameactors/PBSigrid.kt
@@ -20,14 +20,14 @@ object PBSigrid {
 
         p.sprite = SpriteAnimation()
         p.sprite!!.setDimension(28, 51)
-        p.sprite!!.setSpriteImage("res/graphics/sprites/test_player.png")
+        p.sprite!!.setSpriteImage("assets/graphics/sprites/test_player.png")
         p.sprite!!.setDelay(200)
         p.sprite!!.setRowsAndFrames(1, 1)
         p.sprite!!.setAsVisible()
 
         p.spriteGlow = SpriteAnimation()
         p.spriteGlow!!.setDimension(28, 51)
-        p.spriteGlow!!.setSpriteImage("res/graphics/sprites/test_player_glow.png")
+        p.spriteGlow!!.setSpriteImage("assets/graphics/sprites/test_player_glow.png")
         p.spriteGlow!!.setDelay(200)
         p.spriteGlow!!.setRowsAndFrames(1, 1)
         p.spriteGlow!!.setAsVisible()
diff --git a/src/net/torvald/terrarum/gameactors/Player.kt b/src/net/torvald/terrarum/gameactors/Player.kt
index 7afaeed43..5f12434d5 100644
--- a/src/net/torvald/terrarum/gameactors/Player.kt
+++ b/src/net/torvald/terrarum/gameactors/Player.kt
@@ -79,7 +79,7 @@ class Player : ActorWithBody(), Controllable, Pocketed, Factionable, Luminous, L
     override val lightBoxList: List<Hitbox>
         get() = arrayOf(Hitbox(0.0, 0.0, hitbox.width, hitbox.height)).toList() // use getter; dimension of the player may change by time.
 
-    var gamepad: Controller? = Controllers.getController(0)
+    var gamepad: Controller? = null
     var axisX = 0f
     var axisY = 0f
     var axisRX = 0f
@@ -105,6 +105,13 @@ class Player : ActorWithBody(), Controllable, Pocketed, Factionable, Luminous, L
         referenceID = PLAYER_REF_ID // forcibly set ID
         density = BASE_DENSITY
         collisionType = KINEMATIC
+
+        try {
+            gamepad = Controllers.getController(0)
+        }
+        catch (e: IndexOutOfBoundsException) {
+            println("[Player] gamepad not detected.")
+        }
     }
 
     override fun update(gc: GameContainer, delta: Int) {
diff --git a/src/net/torvald/terrarum/gameactors/PlayerBuilder.kt b/src/net/torvald/terrarum/gameactors/PlayerBuilder.kt
index 4c91e4ebb..7f01399d0 100644
--- a/src/net/torvald/terrarum/gameactors/PlayerBuilder.kt
+++ b/src/net/torvald/terrarum/gameactors/PlayerBuilder.kt
@@ -7,7 +7,7 @@ import java.io.IOException
  * Created by minjaesong on 16-03-15.
  */
 object PlayerBuilder {
-    private val JSONPATH = "./res/raw/"
+    private val JSONPATH = "./assets/raw/"
     private val jsonString = String()
 
     @Throws(IOException::class, SlickException::class)
diff --git a/src/net/torvald/terrarum/gameactors/faction/FactionFactory.kt b/src/net/torvald/terrarum/gameactors/faction/FactionFactory.kt
index 4ebf42e06..198056d4a 100644
--- a/src/net/torvald/terrarum/gameactors/faction/FactionFactory.kt
+++ b/src/net/torvald/terrarum/gameactors/faction/FactionFactory.kt
@@ -10,7 +10,7 @@ import java.io.IOException
  */
 object FactionFactory {
 
-    const val JSONPATH = "./res/raw/factions/"
+    const val JSONPATH = "./assets/raw/factions/"
 
     /**
      * @param filename with extension
diff --git a/src/net/torvald/terrarum/langpack/Lang.kt b/src/net/torvald/terrarum/langpack/Lang.kt
index f3e66ba07..4f502cb8c 100644
--- a/src/net/torvald/terrarum/langpack/Lang.kt
+++ b/src/net/torvald/terrarum/langpack/Lang.kt
@@ -28,7 +28,7 @@ object Lang {
 
     val languageList: List<String>
 
-    private val PATH_TO_LANG = "./res/locales/"
+    private val PATH_TO_LANG = "./assets/locales/"
     val POLYGLOT_VERSION = "100"
     private val PREFIX_POLYGLOT = "Polyglot-${POLYGLOT_VERSION}_"
     private val PREFIX_NAMESET = "nameset_"
diff --git a/src/net/torvald/terrarum/mapdrawer/MapCamera.kt b/src/net/torvald/terrarum/mapdrawer/MapCamera.kt
index c46dfce5b..d930ab85b 100644
--- a/src/net/torvald/terrarum/mapdrawer/MapCamera.kt
+++ b/src/net/torvald/terrarum/mapdrawer/MapCamera.kt
@@ -29,11 +29,11 @@ object MapCamera {
 
     private val TSIZE = MapDrawer.TILE_SIZE
 
-    var tilesWall: SpriteSheet = SpriteSheet("./res/graphics/terrain/wall.png", TSIZE, TSIZE)
+    var tilesWall: SpriteSheet = SpriteSheet("./assets/graphics/terrain/wall.png", TSIZE, TSIZE)
         private set
-    var tilesTerrain: SpriteSheet = SpriteSheet("./res/graphics/terrain/terrain.png", TSIZE, TSIZE)
+    var tilesTerrain: SpriteSheet = SpriteSheet("./assets/graphics/terrain/terrain.png", TSIZE, TSIZE)
         private set
-    var tilesWire: SpriteSheet = SpriteSheet("./res/graphics/terrain/wire.png", TSIZE, TSIZE)
+    var tilesWire: SpriteSheet = SpriteSheet("./assets/graphics/terrain/wire.png", TSIZE, TSIZE)
         private set
     var tilesetBook: Array<SpriteSheet> = arrayOf(tilesWall, tilesTerrain, tilesWire)
         private set
diff --git a/src/net/torvald/terrarum/ui/ItemSlotImageBuilder.kt b/src/net/torvald/terrarum/ui/ItemSlotImageBuilder.kt
index 8576315d7..19190cbda 100644
--- a/src/net/torvald/terrarum/ui/ItemSlotImageBuilder.kt
+++ b/src/net/torvald/terrarum/ui/ItemSlotImageBuilder.kt
@@ -20,11 +20,11 @@ object ItemSlotImageBuilder {
     private val colourWhite = Color(0xC0C0C0)
 
     private val numberFont = SpriteSheetFont(
-            SpriteSheet("./res/graphics/fonts/numeric_small.png", 5, 8),
+            SpriteSheet("./assets/graphics/fonts/numeric_small.png", 5, 8),
             '0'
     )
-    val slotImage = Image("./res/graphics/gui/quickbar/item_slot.png") // must have same w/h as slotLarge
-    val slotLarge = Image("./res/graphics/gui/quickbar/item_slot_large.png")
+    val slotImage = Image("./assets/graphics/gui/quickbar/item_slot.png") // must have same w/h as slotLarge
+    val slotLarge = Image("./assets/graphics/gui/quickbar/item_slot_large.png")
     private val canvas = Image(slotImage.width, slotImage.height)
     private val canvasLarge = Image(slotLarge.width, slotLarge.height)
 
diff --git a/src/net/torvald/terrarum/ui/MessageWindow.kt b/src/net/torvald/terrarum/ui/MessageWindow.kt
index 1d0850b20..d035e2dd6 100644
--- a/src/net/torvald/terrarum/ui/MessageWindow.kt
+++ b/src/net/torvald/terrarum/ui/MessageWindow.kt
@@ -31,14 +31,14 @@ constructor(override var width: Int, isBlackVariant: Boolean) : UICanvas {
 
     init {
         if (!isBlackVariant) {
-            segmentLeft = Image("./res/graphics/gui/message_twoline_white_left.png");
-            segmentRight = Image("./res/graphics/gui/message_twoline_white_right.png");
-            segmentBody = Image("./res/graphics/gui/message_twoline_white_body.png");
+            segmentLeft = Image("./assets/graphics/gui/message_twoline_white_left.png");
+            segmentRight = Image("./assets/graphics/gui/message_twoline_white_right.png");
+            segmentBody = Image("./assets/graphics/gui/message_twoline_white_body.png");
         }
         else {
-            segmentLeft = Image("./res/graphics/gui/message_twoline_black_left.png")
-            segmentRight = Image("./res/graphics/gui/message_twoline_black_right.png")
-            segmentBody = Image("./res/graphics/gui/message_twoline_black_body.png")
+            segmentLeft = Image("./assets/graphics/gui/message_twoline_black_left.png")
+            segmentRight = Image("./assets/graphics/gui/message_twoline_black_right.png")
+            segmentBody = Image("./assets/graphics/gui/message_twoline_black_body.png")
         }
         uiFont = GameFontWhite()
         height = segmentLeft!!.height
diff --git a/src/net/torvald/terrarum/weather/WeatherMixer.kt b/src/net/torvald/terrarum/weather/WeatherMixer.kt
index ef38fedf3..ebf522aef 100644
--- a/src/net/torvald/terrarum/weather/WeatherMixer.kt
+++ b/src/net/torvald/terrarum/weather/WeatherMixer.kt
@@ -35,12 +35,12 @@ object WeatherMixer {
     const val WEATHER_GENERIC = "generic"
     // TODO add weather classification indices manually
 
-    const val RAW_DIR = "./res/raw/weathers"
+    const val RAW_DIR = "./assets/raw/weathers"
 
     init {
         weatherList = HashMap<String, ArrayList<BaseModularWeather>>()
 
-        // read weather descriptions from res/weather (modular weather)
+        // read weather descriptions from assets/weather (modular weather)
         val weatherRawValidList = ArrayList<File>()
         val weatherRaws = File(RAW_DIR).listFiles()
         weatherRaws.forEach {
@@ -157,7 +157,7 @@ object WeatherMixer {
   ]
 }
          */
-        val pathToImage = "./res/graphics/weathers"
+        val pathToImage = "./assets/graphics/weathers"
 
         val JSON = JsonFetcher(path)
 
diff --git a/work_files/magic_description_language.numbers b/work_files/magic_description_language.numbers
new file mode 100644
index 000000000..15c2065ce
Binary files /dev/null and b/work_files/magic_description_language.numbers differ