From 0258425ef3ab4f955a8f04a0ee067063d16690cf Mon Sep 17 00:00:00 2001
From: Relintai <relintai@gmail.com>
Date: Sat, 29 Feb 2020 16:52:00 +0100
Subject: [PATCH] Update everything to get the latest Voxelman. Removed
 PropTool addon, as it's now it's in Voxelman by default. Ignore the temporary
 folder.

---
 .gitignore         |  4 +++-
 HEADS              |  2 +-
 SConstruct         |  1 -
 game/project.godot | 38 +-------------------------------------
 4 files changed, 5 insertions(+), 40 deletions(-)

diff --git a/.gitignore b/.gitignore
index a07d94fb..a2809ca9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,4 +24,6 @@ engine/*
 
 *.blend1
 
-.dir-locals.el
\ No newline at end of file
+.dir-locals.el
+
+game/.prop_tool_temp/**
diff --git a/HEADS b/HEADS
index a7ac1ac6..2ea955b5 100644
--- a/HEADS
+++ b/HEADS
@@ -1 +1 @@
-{"engine": {"3.2": "f4e3701893bdf6b304ee114745def2f8ac4aa822", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "a08917370cdef0884042bdb49fb80ece0b2e76ec"}, "entity_spell_system": {"master": "3e10779dbc5258d1e1b08eab287189f9c1ccec64"}, "ui_extensions": {"master": "38acc650db260a831dc26ca96fe9d9a087230bdc"}, "voxelman": {"master": "36063410f99f7e44b2169d66ccb0730c9890d462"}, "texture_packer": {"master": "b17c174906f84de93d84aa60d010ffe603efaa28"}, "fastnoise": {"master": "41b7ea05a1f7aa2b8ecddaa1fd739e64d6970f7e"}, "mesh_data_resource": {"master": "4bda19b12be2c2a79a6121de6d22e48f3934e726"}, "procedural_animations": {"master": "00f6c128bd0e9799b7f7f86e118ed68277fbe27d"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "prop_tool": {"master": "df438053ebc900966f8f842fc65f0264f1271d49"}}
\ No newline at end of file
+{"engine": {"3.2": "f4e3701893bdf6b304ee114745def2f8ac4aa822", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "a08917370cdef0884042bdb49fb80ece0b2e76ec"}, "entity_spell_system": {"master": "3e10779dbc5258d1e1b08eab287189f9c1ccec64"}, "ui_extensions": {"master": "38acc650db260a831dc26ca96fe9d9a087230bdc"}, "voxelman": {"master": "ac75c78be10e0f7d60b7a6f26189523347732276"}, "texture_packer": {"master": "b17c174906f84de93d84aa60d010ffe603efaa28"}, "fastnoise": {"master": "41b7ea05a1f7aa2b8ecddaa1fd739e64d6970f7e"}, "mesh_data_resource": {"master": "4bda19b12be2c2a79a6121de6d22e48f3934e726"}, "procedural_animations": {"master": "ba464ef04500aa01b2638cf1f890f3f6582ead84"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}}
\ No newline at end of file
diff --git a/SConstruct b/SConstruct
index 6f7b31c0..d197c1db 100644
--- a/SConstruct
+++ b/SConstruct
@@ -47,7 +47,6 @@ module_repositories = [
 
 addon_repositories = [
     [ ['https://github.com/Relintai/ess_data.git', 'git@github.com:Relintai/ess_data.git' ], 'ess_data', '' ],
-    [ ['https://github.com/Relintai/prop_tool.git', 'git@github.com:Relintai/prop_tool.git' ], 'prop_tool', '' ],
 ]
 
 third_party_addon_repositories = [
diff --git a/game/project.godot b/game/project.godot
index 256da1fe..6752df86 100644
--- a/game/project.godot
+++ b/game/project.godot
@@ -234,36 +234,6 @@ _global_script_classes=[ {
 "language": "GDScript",
 "path": "res://networking/PlayerMaster.gd"
 }, {
-"base": "Spatial",
-"class": "PropTool",
-"language": "GDScript",
-"path": "res://addons/prop_tool/tools/PropTool.gd"
-}, {
-"base": "Spatial",
-"class": "PropToolEntity",
-"language": "GDScript",
-"path": "res://addons/prop_tool/tools/PropToolEntity.gd"
-}, {
-"base": "OmniLight",
-"class": "PropToolLight",
-"language": "GDScript",
-"path": "res://addons/prop_tool/tools/PropToolLight.gd"
-}, {
-"base": "MeshInstance",
-"class": "PropToolMesh",
-"language": "GDScript",
-"path": "res://addons/prop_tool/tools/PropToolMesh.gd"
-}, {
-"base": "Spatial",
-"class": "PropToolProp",
-"language": "GDScript",
-"path": "res://addons/prop_tool/tools/PropToolProp.gd"
-}, {
-"base": "Spatial",
-"class": "PropToolScene",
-"language": "GDScript",
-"path": "res://addons/prop_tool/tools/PropToolScene.gd"
-}, {
 "base": "SpellEffectVisual",
 "class": "SpellEffectVisualBasic",
 "language": "GDScript",
@@ -340,12 +310,6 @@ _global_script_class_icons={
 "NetworkedPlayerGD": "",
 "PlayerGD": "",
 "PlayerMaster": "",
-"PropTool": "",
-"PropToolEntity": "",
-"PropToolLight": "",
-"PropToolMesh": "",
-"PropToolProp": "",
-"PropToolScene": "",
 "SpellEffectVisualBasic": "",
 "SpellGD": "",
 "TVVoxelChunk": "",
@@ -392,7 +356,7 @@ window/size/viewport_scale=100
 
 [editor_plugins]
 
-enabled=PoolStringArray( "ess_data", "prop_tool" )
+enabled=PoolStringArray( "ess_data" )
 
 [ess]