diff --git a/README.md b/README.md
index 76a376ad..9883ee6f 100644
--- a/README.md
+++ b/README.md
@@ -13,10 +13,9 @@ To set this up:
 3.  Clone this repository to **src-mods** directory.
 
 4.  Go to **src-mods/build** and run **deploy.sh** script. (Or **deploy.bat** if you use Windows)
+    * In Windows, Symlinks cannot be done without any administrator privileges, that meens you need to be an administrator ; the script will run automatically as administrator, or it will ask you your credentials.
 
 5.  It is ready. You may now recompile client and start it.
 
-To build a release, run **make.sh** script **in the MCP directory**. Not from src-mods/build!
+To build a release, go to **src-mods/build** and run **make.sh** script. (Or **make.bat** if you use Windows)
 Resulting zips will be in **reobf/result2**.
-
-build/ln.exe source code can be found here: https://github.com/neosmart/ln-win
\ No newline at end of file
diff --git a/build/conf_deploy/deploy_link.txt b/build/conf_deploy/deploy_link.txt
new file mode 100644
index 00000000..1471453f
--- /dev/null
+++ b/build/conf_deploy/deploy_link.txt
@@ -0,0 +1,9 @@
+/src-mods/src/client /src/minecraft/net/minecraft/src/mods
+/src-mods/resources/olddays /jars/assets/olddays
+/src-mods/resources/textures /jars/assets/textures
+/src-mods/resources /reobf/additional
+/src-mods/src/client-client/ssp/ClientBrandRetriever.java  /src/minecraft/net/minecraft/client/ClientBrandRetriever.java
+/src-mods/src/client-server/ssp/MinecraftServer.java /src/minecraft/net/minecraft/server/MinecraftServer.java
+/src-mods/src/client-client/ssp/Minecraft.java /src/minecraft/net/minecraft/src/Minecraft.java
+/src-mods/resources/char.png /jars/assets/char.png
+/lib/WorldEdit.jar /jars/WorldEdit.jar
diff --git a/build/conf_deploy/deploy_src.txt b/build/conf_deploy/deploy_src.txt
index 6d2b4a70..24832cab 100644
--- a/build/conf_deploy/deploy_src.txt
+++ b/build/conf_deploy/deploy_src.txt
@@ -1,111 +1,111 @@
-Minecraft.java
-EffectRenderer.java
-EntityAIHurtByTarget.java
-EntityEnderPearl.java
-EntityFireworkRocket.java
-EntityPlayerMP.java
-Explosion.java
-GuiChat.java
-GuiCreateWorld.java
-GuiScreen.java
-GuiWorldSlot.java
-ISaveHandler.java
-NetClientHandler.java
-NetServerHandler.java
-RenderBlocks.java
-SaveHandler.java
-SaveHandlerMP.java
-SpawnerAnimals.java
-MobSpawnerBaseLogic.java
-WorldClient.java
-BiomeGenBase.java
-BlockFluid.java
-BlockGrass.java
-BlockSapling.java
-ChestItemRenderHelper.java
-ChunkCache.java
-Chunk.java
-ChunkProviderHell.java
-ComponentStrongholdStairs2.java
-ComponentNetherBridgeCorridor.java
-ComponentNetherBridgeCorridor2.java
-ComponentVillageField2.java
-ComponentVillageField.java
-ComponentVillage.java
-EntityAIMate.java
-EntityAnimal.java
-EntityBreakingFX.java
-EntityFX.java
-EntityOcelot.java
-EntityPickupFX.java
-EntityRenderer.java
-EntityWolf.java
-GenLayer.java
-GuiSelectWorld.java
-ItemEnchantedBook.java
-RenderBiped.java
-RenderGlobal.java
-RenderManager.java
-StructureMineshaftPieces.java
-StructureStrongholdPieces.java
-TileEntityRenderer.java
-WorldChunkManagerHell.java
-WorldChunkManager.java
-WorldGenBigTree.java
-WorldGenTrees.java
-WorldInfo.java
-World.java
-WorldProviderSurface.java
-WorldServer.java
-EntityEnderman.java
-EntityLiving.java
-EntityLivingBase.java
-EntitySheep.java
-EntitySkeleton.java
-EntitySpider.java
-EntityZombie.java
-BlockFire.java
-BlockFlowing.java
-BlockLeaves.java
-BlockMushroom.java
-BlockStairs.java
-EntityEgg.java
-EntityItem.java
-BlockSnow.java
-ItemDye.java
-EntityAIPanic.java
-EntityAITarget.java
-EntityCreature.java
-EntityCreeper.java
-EntityPig.java
-EntitySlime.java
-EntitySnowman.java
-EntityWaterMob.java
-PathFinder.java
-BlockPistonBase.java
-ContainerPlayer.java
-EntityBoat.java
-Entity.java
-EntityMinecart.java
-GuiInventory.java
-EntityDiggingFX.java
-EntityDropParticleFX.java
-EntitySuspendFX.java
-GuiContainer.java
-GuiMainMenu.java
-ItemRenderer.java
-LoadingScreenRenderer.java
-ModelBiped.java
-ModelEnderman.java
-RendererLivingEntity.java
-RenderHelper.java
-RenderItem.java
-TileEntityChestRenderer.java
-TileEntityEnderChestRenderer.java
-EntityArrow.java
-EntityPlayer.java
-EntityXPOrb.java
-FoodStats.java
-GuiIngame.java
-ItemBow.java
+Minecraft.java
+EffectRenderer.java
+EntityAIHurtByTarget.java
+EntityEnderPearl.java
+EntityFireworkRocket.java
+EntityPlayerMP.java
+Explosion.java
+GuiChat.java
+GuiCreateWorld.java
+GuiScreen.java
+GuiWorldSlot.java
+ISaveHandler.java
+NetClientHandler.java
+NetServerHandler.java
+RenderBlocks.java
+SaveHandler.java
+SaveHandlerMP.java
+SpawnerAnimals.java
+MobSpawnerBaseLogic.java
+WorldClient.java
+BiomeGenBase.java
+BlockFluid.java
+BlockGrass.java
+BlockSapling.java
+ChestItemRenderHelper.java
+ChunkCache.java
+Chunk.java
+ChunkProviderHell.java
+ComponentStrongholdStairs2.java
+ComponentNetherBridgeCorridor.java
+ComponentNetherBridgeCorridor2.java
+ComponentVillageField2.java
+ComponentVillageField.java
+ComponentVillage.java
+EntityAIMate.java
+EntityAnimal.java
+EntityBreakingFX.java
+EntityFX.java
+EntityOcelot.java
+EntityPickupFX.java
+EntityRenderer.java
+EntityWolf.java
+GenLayer.java
+GuiSelectWorld.java
+ItemEnchantedBook.java
+RenderBiped.java
+RenderGlobal.java
+RenderManager.java
+StructureMineshaftPieces.java
+StructureStrongholdPieces.java
+TileEntityRenderer.java
+WorldChunkManagerHell.java
+WorldChunkManager.java
+WorldGenBigTree.java
+WorldGenTrees.java
+WorldInfo.java
+World.java
+WorldProviderSurface.java
+WorldServer.java
+EntityEnderman.java
+EntityLiving.java
+EntityLivingBase.java
+EntitySheep.java
+EntitySkeleton.java
+EntitySpider.java
+EntityZombie.java
+BlockFire.java
+BlockFlowing.java
+BlockLeaves.java
+BlockMushroom.java
+BlockStairs.java
+EntityEgg.java
+EntityItem.java
+BlockSnow.java
+ItemDye.java
+EntityAIPanic.java
+EntityAITarget.java
+EntityCreature.java
+EntityCreeper.java
+EntityPig.java
+EntitySlime.java
+EntitySnowman.java
+EntityWaterMob.java
+PathFinder.java
+BlockPistonBase.java
+ContainerPlayer.java
+EntityBoat.java
+Entity.java
+EntityMinecart.java
+GuiInventory.java
+EntityDiggingFX.java
+EntityDropParticleFX.java
+EntitySuspendFX.java
+GuiContainer.java
+GuiMainMenu.java
+ItemRenderer.java
+LoadingScreenRenderer.java
+ModelBiped.java
+ModelEnderman.java
+RendererLivingEntity.java
+RenderHelper.java
+RenderItem.java
+TileEntityChestRenderer.java
+TileEntityEnderChestRenderer.java
+EntityArrow.java
+EntityPlayer.java
+EntityXPOrb.java
+FoodStats.java
+GuiIngame.java
+ItemBow.java
 ItemFood.java
\ No newline at end of file
diff --git a/build/conf_make/make_add_old-days-allin1.txt b/build/conf_make/make_add_old-days-allin1.txt
new file mode 100644
index 00000000..d91e8d86
--- /dev/null
+++ b/build/conf_make/make_add_old-days-allin1.txt
@@ -0,0 +1,54 @@
+olddays/lang
+olddays/presets
+olddays/classic_water.png
+olddays/classic_lava.png
+olddays/fluff.png
+olddays/gear.png
+olddays/gearmiddle.png
+textures/blocks/olddays_gear_0.png
+textures/blocks/olddays_gear_1.png
+textures/blocks/olddays_grass_top.png
+textures/blocks/olddays_grass_side.png
+textures/blocks/olddays_leaves_fast.png
+textures/blocks/olddays_leaves_fancy.png
+olddays/char.png
+olddays/cloth_1.png
+olddays/cloth_2.png
+olddays/cloth_empty.png
+olddays/clock.png
+olddays/compass.png
+olddays/dial.png
+olddays/explosion.png
+olddays/mojang.png
+olddays/mojang2.png
+olddays/moon_phases.png
+olddays/pig.png
+olddays/slime.png
+olddays/textures.png
+textures/blocks/olddays_diamond_bottom.png
+textures/blocks/olddays_diamond_side.png
+textures/blocks/olddays_gold_bottom.png
+textures/blocks/olddays_gold_side.png
+textures/blocks/olddays_iron_bottom.png
+textures/blocks/olddays_iron_side.png
+olddays/sounds
+olddays/allitems.png
+olddays/black.png
+olddays/enderman_eyes.png
+olddays/plate.png
+textures/blocks/olddays_chest_top.png
+textures/blocks/olddays_chest_side.png
+textures/blocks/olddays_chest_back_left.png
+textures/blocks/olddays_chest_back_right.png
+textures/blocks/olddays_chest_front.png
+textures/blocks/olddays_chest_front_left.png
+textures/blocks/olddays_chest_front_right.png
+textures/blocks/olddays_chest_front_left_trap.png
+textures/blocks/olddays_chest_front_right_trap.png
+textures/blocks/olddays_chest_front_trap.png
+textures/blocks/olddays_redstone_dust_cross.png
+textures/blocks/olddays_redstone_dust_cross_powered.png
+textures/blocks/olddays_redstone_dust_line.png
+textures/blocks/olddays_redstone_dust_line_powered.png
+olddays/md3
+olddays/icons.png
\ No newline at end of file
diff --git a/build/conf_make/make_add_old-days-eyecandy.txt b/build/conf_make/make_add_old-days-eyecandy.txt
new file mode 100644
index 00000000..e37fa332
--- /dev/null
+++ b/build/conf_make/make_add_old-days-eyecandy.txt
@@ -0,0 +1,18 @@
+olddays/allitems.png
+olddays/black.png
+olddays/enderman_eyes.png
+olddays/plate.png
+textures/blocks/olddays_chest_top.png
+textures/blocks/olddays_chest_side.png
+textures/blocks/olddays_chest_back_left.png
+textures/blocks/olddays_chest_back_right.png
+textures/blocks/olddays_chest_front.png
+textures/blocks/olddays_chest_front_left.png
+textures/blocks/olddays_chest_front_right.png
+textures/blocks/olddays_chest_front_left_trap.png
+textures/blocks/olddays_chest_front_right_trap.png
+textures/blocks/olddays_chest_front_trap.png
+textures/blocks/olddays_redstone_dust_cross.png
+textures/blocks/olddays_redstone_dust_cross_powered.png
+textures/blocks/olddays_redstone_dust_line.png
+textures/blocks/olddays_redstone_dust_line_powered.png
\ No newline at end of file
diff --git a/build/conf_make/make_add_old-days-gameplay.txt b/build/conf_make/make_add_old-days-gameplay.txt
new file mode 100644
index 00000000..8674133c
--- /dev/null
+++ b/build/conf_make/make_add_old-days-gameplay.txt
@@ -0,0 +1 @@
+olddays/icons.png
\ No newline at end of file
diff --git a/build/conf_make/make_add_old-days-mobs.txt b/build/conf_make/make_add_old-days-mobs.txt
new file mode 100644
index 00000000..aa793bdc
--- /dev/null
+++ b/build/conf_make/make_add_old-days-mobs.txt
@@ -0,0 +1 @@
+olddays/md3
\ No newline at end of file
diff --git a/build/conf_make/make_add_old-days-nbxlite.txt b/build/conf_make/make_add_old-days-nbxlite.txt
new file mode 100644
index 00000000..61efe84f
--- /dev/null
+++ b/build/conf_make/make_add_old-days-nbxlite.txt
@@ -0,0 +1,11 @@
+olddays/classic_water.png
+olddays/classic_lava.png
+olddays/fluff.png
+olddays/gear.png
+olddays/gearmiddle.png
+textures/blocks/olddays_gear_0.png
+textures/blocks/olddays_gear_1.png
+textures/blocks/olddays_grass_top.png
+textures/blocks/olddays_grass_side.png
+textures/blocks/olddays_leaves_fast.png
+textures/blocks/olddays_leaves_fancy.png
\ No newline at end of file
diff --git a/build/conf_make/make_add_old-days-sounds.txt b/build/conf_make/make_add_old-days-sounds.txt
new file mode 100644
index 00000000..eb168323
--- /dev/null
+++ b/build/conf_make/make_add_old-days-sounds.txt
@@ -0,0 +1 @@
+olddays/sounds
\ No newline at end of file
diff --git a/build/conf_make/make_add_old-days-textures.txt b/build/conf_make/make_add_old-days-textures.txt
new file mode 100644
index 00000000..5c410123
--- /dev/null
+++ b/build/conf_make/make_add_old-days-textures.txt
@@ -0,0 +1,20 @@
+olddays/char.png
+olddays/cloth_1.png
+olddays/cloth_2.png
+olddays/cloth_empty.png
+olddays/clock.png
+olddays/compass.png
+olddays/dial.png
+olddays/explosion.png
+olddays/mojang.png
+olddays/mojang2.png
+olddays/moon_phases.png
+olddays/pig.png
+olddays/slime.png
+olddays/textures.png
+textures/blocks/olddays_diamond_bottom.png
+textures/blocks/olddays_diamond_side.png
+textures/blocks/olddays_gold_bottom.png
+textures/blocks/olddays_gold_side.png
+textures/blocks/olddays_iron_bottom.png
+textures/blocks/olddays_iron_side.png
\ No newline at end of file
diff --git a/build/conf_make/make_add_old-days.txt b/build/conf_make/make_add_old-days.txt
new file mode 100644
index 00000000..5c57a197
--- /dev/null
+++ b/build/conf_make/make_add_old-days.txt
@@ -0,0 +1,2 @@
+olddays/lang
+olddays/presets
\ No newline at end of file
diff --git a/build/conf_make/make_add_spawn-human.txt b/build/conf_make/make_add_spawn-human.txt
new file mode 100644
index 00000000..37d62e33
--- /dev/null
+++ b/build/conf_make/make_add_spawn-human.txt
@@ -0,0 +1 @@
+./char.png
\ No newline at end of file
diff --git a/build/conf_make/make_cp_old-days-actions.txt b/build/conf_make/make_cp_old-days-actions.txt
new file mode 100644
index 00000000..ecd98a8e
--- /dev/null
+++ b/build/conf_make/make_cp_old-days-actions.txt
@@ -0,0 +1,21 @@
+BlockFire
+BlockFlowing
+BlockMushroom
+BlockLeaves
+BlockSnow
+BlockStairs
+EntityEgg
+EntityBoat
+EntityItem
+EntitySheep
+ItemDye
+BlockFarmlandOld
+BlockFence2
+BlockLog2
+BlockTNT2
+EntityAIEatGrass2
+EntityTNTPrimed2
+ItemAxe2
+ItemEgg2
+ItemPickaxe2
+ODActions
\ No newline at end of file
diff --git a/build/conf_make/make_cp_old-days-allin1.txt b/build/conf_make/make_cp_old-days-allin1.txt
new file mode 100644
index 00000000..6c0cb687
--- /dev/null
+++ b/build/conf_make/make_cp_old-days-allin1.txt
@@ -0,0 +1,3 @@
+EntityLiving
+EntityLivingBase
+ItemRenderer
\ No newline at end of file
diff --git a/build/conf_make/make_cp_old-days-bugs.txt b/build/conf_make/make_cp_old-days-bugs.txt
new file mode 100644
index 00000000..5343af7e
--- /dev/null
+++ b/build/conf_make/make_cp_old-days-bugs.txt
@@ -0,0 +1,6 @@
+BlockPistonBase
+ContainerPlayer
+EntityBoat
+EntityLivingBase
+EntityMinecart
+ODBugs
\ No newline at end of file
diff --git a/build/conf_make/make_cp_old-days-crafting.txt b/build/conf_make/make_cp_old-days-crafting.txt
new file mode 100644
index 00000000..417becd3
--- /dev/null
+++ b/build/conf_make/make_cp_old-days-crafting.txt
@@ -0,0 +1 @@
+ODCrafting
\ No newline at end of file
diff --git a/build/conf_make/make_cp_old-days-eyecandy.txt b/build/conf_make/make_cp_old-days-eyecandy.txt
new file mode 100644
index 00000000..a29aa590
--- /dev/null
+++ b/build/conf_make/make_cp_old-days-eyecandy.txt
@@ -0,0 +1,34 @@
+EntityDiggingFX
+EntityDropParticleFX
+EntityEnderman
+EntityLivingBase
+EntityPlayer
+EntitySkeleton
+EntitySuspendFX
+EntityZombie
+GuiMainMenu
+ItemRenderer
+LoadingScreenRenderer
+ModelBiped
+RendererLivingEntity
+RenderHelper
+RenderItem
+TileEntityChestRenderer
+TileEntityEnderChestRenderer
+BlockChestOld
+BlockFence2
+BlockRedstoneWireOld
+EntityAIArrowAttack2
+GuiContainerCreativeOld
+ODEyecandy
+OldContainerCreative
+RenderItemFrame2
+LogoEffectRandomizer
+ModelMobArmor
+RenderEnderman2
+RenderMinecart2
+RenderPlayer2
+RenderSkeleton2
+RenderSnowMan2
+RenderTntMinecart2
+RenderZombie2
\ No newline at end of file
diff --git a/build/conf_make/make_cp_old-days-gameplay.txt b/build/conf_make/make_cp_old-days-gameplay.txt
new file mode 100644
index 00000000..9911e7df
--- /dev/null
+++ b/build/conf_make/make_cp_old-days-gameplay.txt
@@ -0,0 +1,12 @@
+EntityArrow
+EntityLivingBase
+EntityPlayer
+EntityXPOrb
+EntityZombie
+FoodStats
+ItemBow
+ItemFood
+BlockCake2
+GuiGameOverOldDaysOverlay
+MovementInputFromOptionsCustom
+ODGameplay
\ No newline at end of file
diff --git a/build/conf_make/make_cp_old-days-mobs.txt b/build/conf_make/make_cp_old-days-mobs.txt
new file mode 100644
index 00000000..5635c483
--- /dev/null
+++ b/build/conf_make/make_cp_old-days-mobs.txt
@@ -0,0 +1,35 @@
+EntityAIPanic
+EntityAITarget
+EntityCreature
+EntityCreeper
+EntityEnderman
+EntityLiving
+EntityLivingBase
+EntitySlime
+EntitySkeleton
+EntitySnowman
+EntitySheep
+EntitySpider
+EntityPig
+EntityWaterMob
+EntityWolf
+EntityZombie
+PathFinder
+EntityAIArrowAttack2
+EntityAIEatGrass2
+EntityRana
+EntitySteve
+EntitySteve$RenderMD3Steve
+MD3Frame
+MD3Loader
+MD3Model
+MD3Renderer
+MD3Shader
+MD3Surface
+MD3Tag
+ODMobs
+PathEntityIndev
+PathFinderIndev
+PathIndev
+PathPointIndev
+RenderMD3
\ No newline at end of file
diff --git a/build/conf_make/make_cp_old-days-nbxlite.txt b/build/conf_make/make_cp_old-days-nbxlite.txt
new file mode 100644
index 00000000..1e6d7980
--- /dev/null
+++ b/build/conf_make/make_cp_old-days-nbxlite.txt
@@ -0,0 +1,52 @@
+BiomeGenBase
+BlockFluid
+BlockGrass
+BlockSapling
+ChestItemRenderHelper
+Chunk
+ChunkCache
+ChunkProviderHell
+ComponentNetherBridgeCorridor
+ComponentNetherBridgeCorridor2
+ComponentStrongholdStairs2
+ComponentVillage
+ComponentVillageField
+ComponentVillageField2
+EntityAIMate
+EntityAnimal
+EntityBreakingFX
+EntityDiggingFX
+EntityFX
+EntityPickupFX
+EntityWolf
+ItemEnchantedBook
+ItemRenderer
+GenLayer
+RenderBiped
+RenderItem
+RenderManager
+StructureMineshaftPieces
+StructureStrongholdPieces
+TileEntityChestRenderer
+TileEntityEnderChestRenderer
+TileEntityRenderer
+World
+WorldChunkManager
+WorldChunkManagerHell
+WorldProviderSurface
+WorldGenBigTree
+WorldGenTrees
+WorldServer
+ComponentMineshaftCorridorOld
+ComponentStrongholdCrossingOld
+ComponentStrongholdStairsOld
+GuiButtonNBXlite
+GuiCreateFlatWorld2
+ODNBXlite
+RenderEnderman2
+RenderItemFrame2
+RenderMinecart2
+RenderPlayer2
+RenderTntMinecart2
+WorldSSP2
+nbxlite/
\ No newline at end of file
diff --git a/build/conf_make/make_cp_old-days-sounds.txt b/build/conf_make/make_cp_old-days-sounds.txt
new file mode 100644
index 00000000..6fc5571e
--- /dev/null
+++ b/build/conf_make/make_cp_old-days-sounds.txt
@@ -0,0 +1,2 @@
+ODSounds
+SoundManager2
\ No newline at end of file
diff --git a/build/conf_make/make_cp_old-days-textures.txt b/build/conf_make/make_cp_old-days-textures.txt
new file mode 100644
index 00000000..fc69ce48
--- /dev/null
+++ b/build/conf_make/make_cp_old-days-textures.txt
@@ -0,0 +1,12 @@
+BlockOreStorageOld
+ItemCoalOld
+ODTextures
+TextureCompassFX
+TextureFlamesFX
+TextureGearFX
+TextureLavaFX
+TextureLavaFlowFX
+TexturePortalFX
+TextureWatchFX
+TextureWaterFX
+TextureWaterFlowFX
\ No newline at end of file
diff --git a/build/conf_make/make_cp_old-days.txt b/build/conf_make/make_cp_old-days.txt
new file mode 100644
index 00000000..403a6f1f
--- /dev/null
+++ b/build/conf_make/make_cp_old-days.txt
@@ -0,0 +1,28 @@
+GuiButtonOldDays
+GuiButtonProp
+GuiOldDaysBase
+GuiOldDaysModules
+GuiOldDaysPresets
+GuiOldDaysSearch
+GuiOldDaysSeparator
+GuiOldDaysSettings
+GuiScrolling
+GuiTextFieldSearch
+IScrollingGui
+OldDaysEasyLocalization
+OldDaysModule
+OldDaysProperty
+OldDaysPropertyBool
+OldDaysPropertyCond
+OldDaysPropertyCond2
+OldDaysPropertyFloat
+OldDaysPropertyInt
+OldDaysPropertyRGB
+OldDaysPropertySet
+OldDaysPropertyString
+OldDaysTextureManager
+OldDaysTextureManager$TextureHook
+SavingManager
+SMPManager
+TextureFX
+mod_OldDays
\ No newline at end of file
diff --git a/build/conf_make/make_mods_list.txt b/build/conf_make/make_mods_list.txt
new file mode 100644
index 00000000..8a04d61b
--- /dev/null
+++ b/build/conf_make/make_mods_list.txt
@@ -0,0 +1,14 @@
+old-days-actions
+old-days-bugs
+old-days-gameplay
+old-days-mobs
+old-days-eyecandy
+old-days-sounds
+old-days-crafting
+old-days-textures
+old-days-nbxlite
+old-days
+old-days-allin1
+spawn-human
+spc
+ssp
\ No newline at end of file
diff --git a/build/conf_make/make_mv_old-days-allin1.txt b/build/conf_make/make_mv_old-days-allin1.txt
new file mode 100644
index 00000000..9972d338
--- /dev/null
+++ b/build/conf_make/make_mv_old-days-allin1.txt
@@ -0,0 +1,176 @@
+BlockFire
+BlockFlowing
+BlockMushroom
+EntityItem
+EntitySheep
+BlockStairs
+ItemCoalOld
+ItemEgg2
+BlockFence2
+BlockFarmlandOld
+BlockLog2
+BlockTNT2
+EntityAIEatGrass2
+EntityTNTPrimed2
+ItemPickaxe2
+ItemAxe2
+ODActions
+EntityEgg
+EntityMinecart
+EntityBoat
+BlockPistonBase
+ContainerPlayer
+ODBugs
+BlockLeaves
+MovementInputFromOptionsCustom
+EntityXPOrb
+FoodStats
+ItemFood
+BlockCake2
+TileEntityEnderChestRenderer
+PathIndev
+BlockSnow
+EntityArrow
+ItemBow
+EntityPlayer
+EntityZombie
+ODGameplay
+ItemEnchantedBook
+IScrollingGui
+EntityCreeper
+EntitySkeleton
+EntitySnowman
+EntityAIPanic
+EntityAITarget
+ComponentNetherBridgeCorridor2
+OldDaysTextureManager$TextureHook
+ItemDye
+EntityAIArrowAttack2
+PathFinder
+TextureFX
+TextureCompassFX
+ComponentNetherBridgeCorridor
+TextureWaterFX
+TextureWaterFlowFX
+TextureLavaFX
+TextureLavaFlowFX
+TextureFlamesFX
+TexturePortalFX
+TextureWatchFX
+GuiScrolling
+EntityCreature
+EntitySpider
+EntityPig
+EntityEnderman
+PathEntityIndev
+BlockSapling
+TextureGearFX
+EntityWaterMob
+EntitySlime
+ODMobs
+ComponentVillageField
+ComponentVillageField2
+PathPointIndev
+MD3Tag
+MD3Frame
+MD3Surface
+MD3Renderer
+MD3Loader
+MD3Shader
+MD3Model
+RenderMD3
+EntitySteve
+EntityRana
+EntitySteve$RenderMD3Steve
+ModelBiped
+RendererLivingEntity
+TileEntityChestRenderer
+EntitySuspendFX
+RenderItem
+GuiOldDaysSeparator
+EntityDiggingFX
+RenderHelper
+EntityDropParticleFX
+LoadingScreenRenderer
+GuiMainMenu
+BlockChestOld
+BlockRedstoneWireOld
+OldContainerCreative
+GuiContainerCreativeOld
+LogoEffectRandomizer
+PathFinderIndev
+GuiButtonNBXlite
+ModelMobArmor
+RenderEnderman2
+RenderMinecart2
+RenderTntMinecart2
+RenderZombie2
+RenderSkeleton2
+RenderSnowMan2
+RenderItemFrame2
+ODEyecandy
+SoundManager2
+ODSounds
+ODCrafting
+BlockOreStorageOld
+ODTextures
+GuiCreateFlatWorld2
+World
+RenderBiped
+GuiGameOverOldDaysOverlay
+BiomeGenBase
+BlockFluid
+ChunkCache
+ComponentVillage
+WorldGenBigTree
+BlockGrass
+ChunkProviderHell
+StructureMineshaftPieces
+EntityAIMate
+EntityAnimal
+ComponentStrongholdStairs2
+EntityWolf
+GenLayer
+WorldChunkManager
+WorldChunkManagerHell
+StructureStrongholdPieces
+ComponentStrongholdStairsOld
+ComponentStrongholdCrossingOld
+WorldServer
+RenderPlayer2
+ChestItemRenderHelper
+WorldProviderSurface
+WorldGenTrees
+WorldSSP2
+ComponentMineshaftCorridorOld
+ODNBXlite
+nbxlite/
+EntityPickupFX
+RenderManager
+Chunk
+TileEntityRenderer
+EntityFX
+EntityBreakingFX
+GuiOldDaysPresets
+GuiButtonOldDays
+GuiOldDaysModules
+GuiOldDaysSettings
+mod_OldDays
+OldDaysModule
+OldDaysProperty
+OldDaysPropertyBool
+OldDaysPropertySet
+OldDaysPropertyInt
+OldDaysPropertyString
+OldDaysPropertyRGB
+OldDaysPropertyCond
+OldDaysPropertyFloat
+OldDaysTextureManager
+SavingManager
+SMPManager
+OldDaysEasyLocalization
+GuiOldDaysBase
+GuiOldDaysSearch
+GuiTextFieldSearch
+GuiButtonProp
+OldDaysPropertyCond2
\ No newline at end of file
diff --git a/build/conf_make/make_mv_spawn-human.txt b/build/conf_make/make_mv_spawn-human.txt
new file mode 100644
index 00000000..f641d6c8
--- /dev/null
+++ b/build/conf_make/make_mv_spawn-human.txt
@@ -0,0 +1,4 @@
+EntityHuman
+ModelHuman
+RenderHuman
+mod_SpawnHuman
\ No newline at end of file
diff --git a/build/conf_make/make_mv_spc.txt b/build/conf_make/make_mv_spc.txt
new file mode 100644
index 00000000..a57dcecb
--- /dev/null
+++ b/build/conf_make/make_mv_spc.txt
@@ -0,0 +1,27 @@
+CommandClientSPC
+EntityPlayerSPSPC
+PlayerHelper
+PlayerHelper$1
+Settings
+SPCCheckVersion
+SPCCommand
+SPCEntity
+SPCEntityCamera
+SPCEntityInterface
+SPCLocalConfiguration
+SPCLocalPlayer
+SPCLocalWorld
+SPCObjectHit
+SPCPlugin
+SPCPluginManager
+SPCPoint
+SPCServerInterface
+SPCVersion
+SPCVersionInterface
+SPCWorld
+SPCWorldInterface
+WorldEditPlugin
+mod_SSPC
+spc_WorldEdit
+spc_paint
+spc_path
\ No newline at end of file
diff --git a/build/conf_make/make_mv_ssp.txt b/build/conf_make/make_mv_ssp.txt
new file mode 100644
index 00000000..f3981398
--- /dev/null
+++ b/build/conf_make/make_mv_ssp.txt
@@ -0,0 +1,3 @@
+net/ 
+ssp/ 
+other
\ No newline at end of file
diff --git a/build/conf_make/make_unused.txt b/build/conf_make/make_unused.txt
new file mode 100644
index 00000000..1bc306e1
--- /dev/null
+++ b/build/conf_make/make_unused.txt
@@ -0,0 +1,9 @@
+spc_tester
+spc_WorldEditGUI
+spc_aprilfools1
+spc_AprilFools2012
+spc_Elevators
+RenderGroup
+Group$GroupBlock
+Group$1
+Group
\ No newline at end of file
diff --git a/build/daily.sh b/build/daily.sh
old mode 100755
new mode 100644
index d731a571..b88a849d
--- a/build/daily.sh
+++ b/build/daily.sh
@@ -1,45 +1,46 @@
-#!/bin/bash
-
-MCPDIR=~/.mcp
-VERSION=`date --date="-1minute" -I`
-UPLOADDIR=~/Dropbox/Public/minecraft-mods-daily
-
-cd $MCPDIR
-cd src-mods
-YESTERDAY=`date --date="yesterday" -I`
-LOG=`git log --since=$YESTERDAY`
-git log --since=$YESTERDAY > $UPLOADDIR/changelog-latest
-if [ ! -s $UPLOADDIR/changelog-latest ]; then
-    exit 0
-fi
-notify-send -i document-properties "Daily Minecraft mod builds" "Starting building $VERSION"
-cd ..
-./make.sh
-mkdir -p $UPLOADDIR/$VERSION
-cp $UPLOADDIR/changelog-latest $UPLOADDIR/$VERSION/changelog
-cd reobf/result2/client
-cp * $UPLOADDIR/$VERSION
-cd $UPLOADDIR/$VERSION
-rm unused.zip
-cd ..
-rm latest
-ln -s $VERSION latest
-matedialog --question --title "Daily Minecraft mod builds" --text "Is this version stable?"
-if [[ $? == "0" ]]; then
-    rm -rf stable-old
-    mv stable stable-old
-    cp -r $VERSION stable
-fi
-FILES=`ls -v | tail -12`
-mkdir temp
-for F in $FILES; do
-    mv $F temp
-done
-rm -r `ls -I "[lts]*"`
-cd temp
-for F in $FILES; do
-    mv $F ..
-done
-cd ..
-rm -r temp
-notify-send -i document-properties "Daily Minecraft mod builds" "Finished building $VERSION"
+#!/bin/bash
+
+MCPDIR=~/.mcp
+VERSION=`date --date="-1minute" -I`
+UPLOADDIR=~/Dropbox/Public/minecraft-mods-daily
+
+cd $MCPDIR
+cd src-mods
+YESTERDAY=`date --date="yesterday" -I`
+LOG=`git log --since=$YESTERDAY`
+git log --since=$YESTERDAY > $UPLOADDIR/changelog-latest
+if [ ! -s $UPLOADDIR/changelog-latest ]; then
+    exit 0
+fi
+notify-send -i document-properties "Daily Minecraft mod builds" "Starting building $VERSION"
+cd build
+./make.sh
+cd ../..
+mkdir -p $UPLOADDIR/$VERSION
+cp $UPLOADDIR/changelog-latest $UPLOADDIR/$VERSION/changelog
+cd reobf/result2/client
+cp * $UPLOADDIR/$VERSION
+cd $UPLOADDIR/$VERSION
+rm unused.zip
+cd ..
+rm latest
+ln -s $VERSION latest
+matedialog --question --title "Daily Minecraft mod builds" --text "Is this version stable?"
+if [[ $? == "0" ]]; then
+    rm -rf stable-old
+    mv stable stable-old
+    cp -r $VERSION stable
+fi
+FILES=`ls -v | tail -12`
+mkdir temp
+for F in $FILES; do
+    mv $F temp
+done
+rm -r `ls -I "[lts]*"`
+cd temp
+for F in $FILES; do
+    mv $F ..
+done
+cd ..
+rm -r temp
+notify-send -i document-properties "Daily Minecraft mod builds" "Finished building $VERSION"
diff --git a/build/deploy.bat b/build/deploy.bat
index 74b5b477..32696ae4 100644
--- a/build/deploy.bat
+++ b/build/deploy.bat
@@ -1,44 +1,4 @@
 @echo off
-
-cd ..
-cd ..
-
-:SETUP
-set SRC=%cd%\src\minecraft\net\minecraft\src\
-set CL=%cd%\src\minecraft\net\minecraft\client\
-set CS=%cd%\src\minecraft\net\minecraft\server\
-set MODSSRC=%cd%\src-mods\src\client\
-set MODSCL=%cd%\src-mods\src\client-client\
-set MODSCS=%cd%\src-mods\src\client-server\
-set CONF=%cd%\src-mods\build\conf_deploy\
-cls
-Echo.
-Echo. WARNING : The Original Minecraft Source will not be saved.
-Echo.
-Echo.Press enter to deploy the repository
-pause >NUL
-cls
-
-:DEL
-Echo.
-Echo. * Deleting old files
-Echo.
-for /f %%a in (%CONF%\deploy_src.txt) do del %SRC%\%%a
-for /f %%a in (%CONF%\deploy_server.txt) do del %CS%\%%a
-for /f %%a in (%CONF%\deploy_client.txt) do del %CL%\%%a
-
-:LINK
-Echo.
-Echo. * Linking src files
-Echo.
-fsutil hardlink create %CL%\ClientBrandRetriever.java %MODSCL%\ssp\ClientBrandRetriever.java
-fsutil hardlink create %CS%\MinecraftServer.java %MODSCS%\ssp\MinecraftServer.java
-fsutil hardlink create %SRC%\Minecraft.java %MODSCL%\ssp\Minecraft.java
-fsutil hardlink create %cd%\jars\assets\char.png %cd%\src-mods\resources\char.png
-%cd%\src-mods\build\ln.exe %cd%\src-mods\src\client\ %cd%\src\minecraft\net\minecraft\src\mods\
-%cd%\src-mods\build\ln.exe %cd%\src-mods\resources\olddays\ %cd%\jars\assets\olddays\
-%cd%\src-mods\build\ln.exe %cd%\src-mods\resources\textures\ %cd%\jars\assets\textures\
-%cd%\src-mods\build\wget.exe http://dev.bukkit.org/media/files/715/447/worldedit-5.5.7.jar -cO lib/WorldEdit.jar
-fsutil hardlink create %cd%\jars\WorldEdit.jar %cd%\lib\WorldEdit.jar
-pause
-cls
\ No newline at end of file
+pushd "%cd%" && cd /d "%~dp0" && ( if exist "%temp%\getadmin.vbs" del "%temp%\getadmin.vbs" ) && fsutil dirty query %systemdrive% >nul || if %errorlevel%==0 ( echo Set UAC = CreateObject^("Shell.Application"^) > "%temp%\getadmin.vbs" && echo UAC.ShellExecute "%~s0", "", "", "runas", 1 >> "%temp%\getadmin.vbs" && "%temp%\getadmin.vbs" && exit /B )
+cd .. && cd ..
+runtime\bin\python\python_mcp src-mods\build\runtime\deploy.py %*
\ No newline at end of file
diff --git a/build/deploy.sh b/build/deploy.sh
index 7aafaf1e..e11d8bdd 100755
--- a/build/deploy.sh
+++ b/build/deploy.sh
@@ -1,226 +1,3 @@
-#!/bin/bash
-
-WEURL="http://dev.bukkit.org/media/files/715/447/worldedit-5.5.7.jar"
-MODDIR="src-mods"
-SRCDIR="src/minecraft/net/minecraft"
-CC="$MODDIR/src/client-client"
-CS="$MODDIR/src/client-server"
-CL="$MODDIR/src/client"
-CLSSP="EffectRenderer.java
-EntityAIHurtByTarget.java
-EntityEnderPearl.java
-EntityFireworkRocket.java
-EntityPlayerMP.java
-Explosion.java
-GuiChat.java
-GuiCreateWorld.java
-GuiScreen.java
-GuiWorldSlot.java
-ISaveHandler.java
-NetClientHandler.java
-NetServerHandler.java
-RenderBlocks.java
-SaveHandler.java
-SaveHandlerMP.java
-SpawnerAnimals.java
-MobSpawnerBaseLogic.java
-WorldClient.java"
-CLNL="BiomeGenBase.java
-BlockFluid.java
-BlockGrass.java
-BlockSapling.java
-ChestItemRenderHelper.java
-ChunkCache.java
-Chunk.java
-ChunkProviderHell.java
-ComponentStrongholdStairs2.java
-ComponentNetherBridgeCorridor.java
-ComponentNetherBridgeCorridor2.java
-ComponentVillageField2.java
-ComponentVillageField.java
-ComponentVillage.java
-EntityAIMate.java
-EntityAnimal.java
-EntityBreakingFX.java
-EntityFX.java
-EntityOcelot.java
-EntityPickupFX.java
-EntityRenderer.java
-EntityWolf.java
-GenLayer.java
-GuiSelectWorld.java
-ItemEnchantedBook.java
-RenderBiped.java
-RenderGlobal.java
-RenderManager.java
-StructureMineshaftPieces.java
-StructureStrongholdPieces.java
-TileEntityRenderer.java
-WorldChunkManagerHell.java
-WorldChunkManager.java
-WorldGenBigTree.java
-WorldGenTrees.java
-WorldInfo.java
-World.java
-WorldProviderSurface.java
-WorldServer.java"
-CLOD="EntityEnderman.java
-EntityLiving.java
-EntityLivingBase.java
-EntitySheep.java
-EntitySkeleton.java
-EntitySpider.java
-EntityZombie.java
-actions/BlockFire.java
-actions/BlockFlowing.java
-actions/BlockLeaves.java
-actions/BlockMushroom.java
-actions/BlockStairs.java
-actions/EntityEgg.java
-actions/EntityItem.java
-actions/BlockSnow.java
-actions/ItemDye.java
-behavior/EntityAIPanic.java
-behavior/EntityAITarget.java
-behavior/EntityCreature.java
-behavior/EntityCreeper.java
-behavior/EntityPig.java
-behavior/EntitySlime.java
-behavior/EntitySnowman.java
-behavior/EntityWaterMob.java
-behavior/PathFinder.java
-bugs/BlockPistonBase.java
-bugs/ContainerPlayer.java
-bugs/EntityBoat.java
-bugs/Entity.java
-bugs/EntityMinecart.java
-bugs/GuiInventory.java
-eyecandy/EntityDiggingFX.java
-eyecandy/EntityDropParticleFX.java
-eyecandy/EntitySuspendFX.java
-eyecandy/GuiContainer.java
-eyecandy/GuiMainMenu.java
-eyecandy/ItemRenderer.java
-eyecandy/LoadingScreenRenderer.java
-eyecandy/ModelBiped.java
-eyecandy/ModelEnderman.java
-eyecandy/RendererLivingEntity.java
-eyecandy/RenderHelper.java
-eyecandy/RenderItem.java
-eyecandy/TileEntityChestRenderer.java
-eyecandy/TileEntityEnderChestRenderer.java
-gameplay/EntityArrow.java
-gameplay/EntityPlayer.java
-gameplay/EntityXPOrb.java
-gameplay/FoodStats.java
-gameplay/GuiIngame.java
-gameplay/ItemBow.java
-gameplay/ItemFood.java"
-ODDIRS="actions behavior bugs eyecandy gameplay"
-
-cd ..
-
-copy()
-{
-    mkdir -p $CC/ssp
-    cp $SRCDIR/src/Minecraft.java $CC/ssp
-    cp $SRCDIR/client/ClientBrandRetriever.java $CC/ssp
-    mkdir -p $CS/ssp
-    cp $SRCDIR/server/MinecraftServer.java $CS/ssp
-    mkdir -p $CL/ssp
-    for F in $CLSSP; do
-        cp $SRCDIR/src/$F $CL/ssp
-    done
-    mkdir -p $CL/nbxlite
-    for F in $CLNL; do
-        cp $SRCDIR/src/$F $CL/nbxlite
-    done
-    for F in $ODDIRS; do
-        mkdir -p $CL/olddays/$F
-    done
-    for F in $CLOD; do
-        cp $SRCDIR/src/$(basename $F) $CL/olddays/$F
-    done
-}
-move()
-{
-    mkdir -p $CC/ssp
-    mv $SRCDIR/src/Minecraft.java $CC/ssp
-    mv $SRCDIR/client/ClientBrandRetriever.java $CC/ssp
-    mkdir -p $CS/ssp
-    mv $SRCDIR/server/MinecraftServer.java $CS/ssp
-    mkdir -p $CL/ssp
-    for F in $CLSSP; do
-        mv $SRCDIR/src/$F $CL/ssp
-    done
-    mkdir -p $CL/nbxlite
-    for F in $CLNL; do
-        mv $SRCDIR/src/$F $CL/nbxlite
-    done
-    for F in $ODDIRS; do
-        mkdir -p $CL/olddays/$F
-    done
-    for F in $CLOD; do
-        mv $SRCDIR/src/$(basename $F) $CL/olddays/$F
-    done
-}
-remove()
-{
-    rm $SRCDIR/client/ClientBrandRetriever.java
-    rm $SRCDIR/server/MinecraftServer.java
-    for F in $CLSSP; do
-        rm $SRCDIR/src/$F
-    done
-    for F in $CLNL; do
-        rm $SRCDIR/src/$F
-    done
-    for F in $CLOD; do
-        rm $SRCDIR/src/$(basename $F)
-    done
-    rm $SRCDIR/src/Minecraft.java
-}
-link()
-{
-    cd $SRCDIR/client
-    ln -s ../../../../../$CC/ssp/ClientBrandRetriever.java
-    cd ../server
-    ln -s ../../../../../$CS/ssp/MinecraftServer.java
-    cd ../src
-    ln -s ../../../../../$CC/ssp/Minecraft.java
-    ln -s ../../../../../$CL mods
-    cd ../../../../..
-}
-if [ $1 ]; then
-if [ "$1" == "copy" ]; then
-    copy
-    exit 0
-fi
-if [ "$1" == "move" ]; then
-    cd ..
-    move
-    exit 0
-fi
-if [ "$1" == "remove" ]; then
-    remove
-    exit 0
-fi
-if [ "$1" == "link" ]; then
-    link
-    exit 0
-fi
-if [ "$1" == "update" ]; then
-    move
-    link
-    exit 0
-fi
-fi
-cd ..
-ln -s $MODDIR/build/make.sh .
-remove
-link
-for F in $MODDIR/resources/*; do
-    ln -s "../../$F" jars/assets
-done
-ln -s "../$MODDIR/resources" reobf/additional
-wget $WEURL -cO lib/WorldEdit.jar
-ln -s "../lib/WorldEdit.jar" jars
+#!/bin/bash
+cd ../..
+python src-mods/build/runtime/deploy.py "$@"
diff --git a/build/ln.exe b/build/ln.exe
deleted file mode 100644
index 8129ade8..00000000
Binary files a/build/ln.exe and /dev/null differ
diff --git a/build/make.bat b/build/make.bat
new file mode 100644
index 00000000..fed72e5f
--- /dev/null
+++ b/build/make.bat
@@ -0,0 +1,3 @@
+@echo off
+cd .. && cd ..
+runtime\bin\python\python_mcp src-mods\build\runtime\make.py %*
\ No newline at end of file
diff --git a/build/make.sh b/build/make.sh
index 4388bc0d..2eea3648 100755
--- a/build/make.sh
+++ b/build/make.sh
@@ -1,473 +1,3 @@
 #!/bin/bash
-
-DIR=`pwd`/reobf
-#~/.minecraft/mcp1.3.2/reobf
-ORIG_DIR=$DIR/minecraft
-ORIG_DIR_SERVER=$DIR/minecraft_server
-ADDITIONAL_DIR=$DIR/additional
-RESULT_DIR=$DIR/result
-RESULT_DIR_2=$DIR/result2
-
-find()
-{
-    for F in *.class; do
-        EXPR="^.?$1.java"
-        if [ -n "`strings $F | grep -E $EXPR`" ]; then
-            echo ${F%.class}
-            exit 0
-        fi
-    done
-    echo "No_Such_Class!"
-    exit 0
-}
-
-#MODS_LIST_SERVER="nbxlite old-days old-days-actions old-days-bugs old-days-gameplay old-days-mobs old-days-crafting old-days-allin1"
-
-cd $DIR/..
-sh recompile.sh
-sh reobfuscate.sh
-
-cd $ORIG_DIR
-MODS_LIST="old-days-actions
-           old-days-bugs
-           old-days-gameplay
-           old-days-mobs
-           old-days-eyecandy
-           old-days-sounds
-           old-days-crafting
-           old-days-textures
-           old-days-nbxlite
-           old-days
-           old-days-allin1
-           spawn-human
-           spc
-           ssp"
-UNUSED[0]="spc_tester
-           spc_WorldEditGUI
-           spc_aprilfools1
-           spc_AprilFools2012
-           spc_Elevators
-           Group
-           Group\$1
-           Group\$GroupBlock
-           RenderGroup"
-CP[1]="`find BlockFire`
-       `find BlockFlowing`
-       `find BlockMushroom`
-       `find BlockLeaves`
-       `find BlockSnow`
-       `find BlockStairs`
-       `find EntityEgg`
-       `find EntityBoat`
-       `find EntityItem`
-       `find EntitySheep`
-       `find ItemDye`
-       BlockFarmlandOld
-       BlockFence2
-       BlockLog2
-       BlockTNT2
-       EntityAIEatGrass2
-       EntityTNTPrimed2
-       ItemAxe2
-       ItemEgg2
-       ItemPickaxe2
-       ODActions"
-CP[2]="`find BlockPistonBase`
-       `find ContainerPlayer`
-       `find EntityBoat`
-       `find EntityLivingBase`
-       `find EntityMinecart`
-       ODBugs"
-CP[3]="`find EntityArrow`
-       `find EntityLivingBase`
-       `find EntityPlayer`
-       `find EntityXPOrb`
-       `find EntityZombie`
-       `find FoodStats`
-       `find ItemBow`
-       `find ItemFood`
-       BlockCake2
-       GuiGameOverOldDaysOverlay
-       MovementInputFromOptionsCustom
-       ODGameplay"
-ADD[3]="olddays/icons.png"
-CP[4]="`find EntityAIPanic`
-       `find EntityAITarget`
-       `find EntityCreature`
-       `find EntityCreeper`
-       `find EntityEnderman`
-       `find EntityLiving`
-       `find EntityLivingBase`
-       `find EntitySlime`
-       `find EntitySkeleton`
-       `find EntitySnowman`
-       `find EntitySheep`
-       `find EntitySpider`
-       `find EntityPig`
-       `find EntityWaterMob`
-       `find EntityWolf`
-       `find EntityZombie`
-       `find PathFinder`
-       EntityAIArrowAttack2
-       EntityAIEatGrass2
-       EntityRana
-       EntitySteve
-       EntitySteve\$RenderMD3Steve
-       MD3Frame
-       MD3Loader
-       MD3Model
-       MD3Renderer
-       MD3Shader
-       MD3Surface
-       MD3Tag
-       ODMobs
-       PathEntityIndev
-       PathFinderIndev
-       PathIndev
-       PathPointIndev
-       RenderMD3"
-ADD[4]="olddays/md3"
-CP[5]="`find EntityDiggingFX`
-       `find EntityDropParticleFX`
-       `find EntityEnderman`
-       `find EntityLivingBase`
-       `find EntityPlayer`
-       `find EntitySkeleton`
-       `find EntitySuspendFX`
-       `find EntityZombie`
-       `find GuiMainMenu`
-       `find ItemRenderer`
-       `find LoadingScreenRenderer`
-       `find ModelBiped`
-       `find RendererLivingEntity`
-       `find RenderHelper`
-       `find RenderItem`
-       `find TileEntityChestRenderer`
-       `find TileEntityEnderChestRenderer`
-       BlockChestOld
-       BlockFence2
-       BlockRedstoneWireOld
-       EntityAIArrowAttack2
-       GuiContainerCreativeOld
-       ODEyecandy
-       OldContainerCreative
-       RenderItemFrame2
-       LogoEffectRandomizer
-       ModelMobArmor
-       RenderEnderman2
-       RenderMinecart2
-       RenderPlayer2
-       RenderSkeleton2
-       RenderSnowMan2
-       RenderTntMinecart2
-       RenderZombie2"
-ADD[5]="olddays/allitems.png
-        olddays/black.png
-        olddays/enderman_eyes.png
-        olddays/plate.png
-        textures/blocks/olddays_chest_top.png
-        textures/blocks/olddays_chest_side.png
-        textures/blocks/olddays_chest_back_left.png
-        textures/blocks/olddays_chest_back_right.png
-        textures/blocks/olddays_chest_front.png
-        textures/blocks/olddays_chest_front_left.png
-        textures/blocks/olddays_chest_front_right.png
-        textures/blocks/olddays_chest_front_left_trap.png
-        textures/blocks/olddays_chest_front_right_trap.png
-        textures/blocks/olddays_chest_front_trap.png
-        textures/blocks/olddays_redstone_dust_cross.png
-        textures/blocks/olddays_redstone_dust_cross_powered.png
-        textures/blocks/olddays_redstone_dust_line.png
-        textures/blocks/olddays_redstone_dust_line_powered.png"
-CP[6]="ODSounds
-       SoundManager2"
-ADD[6]="olddays/sounds"
-CP[7]="ODCrafting"
-CP[8]="BlockOreStorageOld
-       ItemCoalOld
-       ODTextures
-       TextureCompassFX
-       TextureFlamesFX
-       TextureGearFX
-       TextureLavaFX
-       TextureLavaFlowFX
-       TexturePortalFX
-       TextureWatchFX
-       TextureWaterFX
-       TextureWaterFlowFX"
-ADD[8]="olddays/char.png
-        olddays/cloth_1.png
-        olddays/cloth_2.png
-        olddays/cloth_empty.png
-        olddays/clock.png
-        olddays/compass.png
-        olddays/dial.png
-        olddays/explosion.png
-        olddays/mojang.png
-        olddays/mojang2.png
-        olddays/moon_phases.png
-        olddays/pig.png
-        olddays/slime.png
-        olddays/textures.png
-        textures/blocks/olddays_diamond_bottom.png
-        textures/blocks/olddays_diamond_side.png
-        textures/blocks/olddays_gold_bottom.png
-        textures/blocks/olddays_gold_side.png
-        textures/blocks/olddays_iron_bottom.png
-        textures/blocks/olddays_iron_side.png"
-CP[9]="`find BiomeGenBase`
-       `find BlockFluid`
-       `find BlockGrass`
-       `find BlockSapling`
-       `find ChestItemRenderHelper`
-       `find Chunk`
-       `find ChunkCache`
-       `find ChunkProviderHell`
-       `find ComponentNetherBridgeCorridor`
-       `find ComponentNetherBridgeCorridor2`
-       `find ComponentStrongholdStairs2`
-       `find ComponentVillage`
-       `find ComponentVillageField`
-       `find ComponentVillageField2`
-       `find EntityAIMate`
-       `find EntityAnimal`
-       `find EntityBreakingFX`
-       `find EntityDiggingFX`
-       `find EntityFX`
-       `find EntityPickupFX`
-       `find EntityWolf`
-       `find ItemEnchantedBook`
-       `find ItemRenderer`
-       `find GenLayer`
-       `find RenderBiped`
-       `find RenderItem`
-       `find RenderManager`
-       `find StructureMineshaftPieces`
-       `find StructureStrongholdPieces`
-       `find TileEntityChestRenderer`
-       `find TileEntityEnderChestRenderer`
-       `find TileEntityRenderer`
-       `find World`
-       `find WorldChunkManager`
-       `find WorldChunkManagerHell`
-       `find WorldProviderSurface`
-       `find WorldGenBigTree`
-       `find WorldGenTrees`
-       `find WorldServer`
-       ComponentMineshaftCorridorOld
-       ComponentStrongholdCrossingOld
-       ComponentStrongholdStairsOld
-       GuiButtonNBXlite
-       GuiCreateFlatWorld2
-       ODNBXlite
-       RenderEnderman2
-       RenderItemFrame2
-       RenderMinecart2
-       RenderPlayer2
-       RenderTntMinecart2
-       WorldSSP2
-       nbxlite/"
-ADD[9]="olddays/classic_water.png
-        olddays/classic_lava.png
-        olddays/fluff.png
-        olddays/gear.png
-        olddays/gearmiddle.png
-        textures/blocks/olddays_gear_0.png
-        textures/blocks/olddays_gear_1.png
-        textures/blocks/olddays_grass_top.png
-        textures/blocks/olddays_grass_side.png
-        textures/blocks/olddays_leaves_fast.png
-        textures/blocks/olddays_leaves_fancy.png"
-CP[10]="GuiButtonOldDays
-        GuiButtonProp
-        GuiOldDaysBase
-        GuiOldDaysModules
-        GuiOldDaysPresets
-        GuiOldDaysSearch
-        GuiOldDaysSeparator
-        GuiOldDaysSettings
-        GuiScrolling
-        GuiTextFieldSearch
-        IScrollingGui
-        OldDaysEasyLocalization
-        OldDaysModule
-        OldDaysProperty
-        OldDaysPropertyBool
-        OldDaysPropertyCond
-        OldDaysPropertyCond2
-        OldDaysPropertyFloat
-        OldDaysPropertyInt
-        OldDaysPropertyRGB
-        OldDaysPropertySet
-        OldDaysPropertyString
-        OldDaysTextureManager
-        OldDaysTextureManager\$TextureHook
-        SavingManager
-        SMPManager
-        TextureFX
-        mod_OldDays"
-ADD[10]="olddays/lang
-         olddays/presets"
-MV[11]="`find BlockFire` `find BlockFlowing` `find BlockMushroom` `find EntityItem` `find EntitySheep` `find BlockStairs` ItemCoalOld ItemEgg2
-        BlockFence2 BlockFarmlandOld BlockLog2 BlockTNT2 EntityAIEatGrass2 EntityTNTPrimed2 ItemPickaxe2 ItemAxe2 ODActions `find EntityEgg`
-        `find EntityMinecart` `find EntityBoat` `find BlockPistonBase` `find ContainerPlayer` ODBugs `find BlockLeaves` MovementInputFromOptionsCustom
-        `find EntityXPOrb` `find FoodStats` `find ItemFood` BlockCake2 `find TileEntityEnderChestRenderer` PathIndev `find BlockSnow`
-        `find EntityArrow` `find ItemBow` `find EntityPlayer` `find EntityZombie` ODGameplay `find ItemEnchantedBook` IScrollingGui
-        `find EntityCreeper` `find EntitySkeleton` `find EntitySnowman` `find EntityAIPanic` `find EntityAITarget` `find ComponentNetherBridgeCorridor2`
-        OldDaysTextureManager\$TextureHook `find ItemDye` EntityAIArrowAttack2 `find PathFinder` TextureFX TextureCompassFX `find ComponentNetherBridgeCorridor`
-        TextureWaterFX TextureWaterFlowFX TextureLavaFX TextureLavaFlowFX TextureFlamesFX TexturePortalFX TextureWatchFX GuiScrolling
-        `find EntityCreature` `find EntitySpider` `find EntityPig` `find EntityEnderman` PathEntityIndev `find BlockSapling` TextureGearFX
-        `find EntityWaterMob` `find EntitySlime` ODMobs `find ComponentVillageField` `find ComponentVillageField2` PathPointIndev
-        MD3Tag MD3Frame MD3Surface MD3Renderer MD3Loader MD3Shader MD3Model RenderMD3 EntitySteve EntityRana EntitySteve\$RenderMD3Steve
-        `find ModelBiped` `find RendererLivingEntity` `find TileEntityChestRenderer` `find EntitySuspendFX` `find RenderItem` GuiOldDaysSeparator
-        `find EntityDiggingFX` `find RenderHelper` `find EntityDropParticleFX` `find LoadingScreenRenderer` `find GuiMainMenu`
-        BlockChestOld BlockRedstoneWireOld OldContainerCreative GuiContainerCreativeOld LogoEffectRandomizer PathFinderIndev GuiButtonNBXlite
-        ModelMobArmor RenderEnderman2 RenderMinecart2 RenderTntMinecart2 RenderZombie2 RenderSkeleton2 RenderSnowMan2 RenderItemFrame2 ODEyecandy
-        SoundManager2 ODSounds ODCrafting BlockOreStorageOld ODTextures GuiCreateFlatWorld2 `find World` `find RenderBiped` GuiGameOverOldDaysOverlay
-        `find BiomeGenBase` `find BlockFluid` `find ChunkCache` `find ComponentVillage` `find WorldGenBigTree` `find BlockGrass`
-        `find ChunkProviderHell` `find StructureMineshaftPieces` `find EntityAIMate` `find EntityAnimal` `find ComponentStrongholdStairs2`
-        `find EntityWolf` `find GenLayer` `find WorldChunkManager` `find WorldChunkManagerHell` `find StructureStrongholdPieces`
-        ComponentStrongholdStairsOld ComponentStrongholdCrossingOld `find WorldServer` RenderPlayer2 `find ChestItemRenderHelper`
-        `find WorldProviderSurface` `find WorldGenTrees` WorldSSP2 ComponentMineshaftCorridorOld ODNBXlite nbxlite/ `find EntityPickupFX`
-        `find RenderManager` `find Chunk` `find TileEntityRenderer` `find EntityFX` `find EntityBreakingFX` GuiOldDaysPresets
-        GuiButtonOldDays GuiOldDaysModules GuiOldDaysSettings mod_OldDays OldDaysModule OldDaysProperty OldDaysPropertyBool OldDaysPropertySet
-        OldDaysPropertyInt OldDaysPropertyString OldDaysPropertyRGB OldDaysPropertyCond OldDaysPropertyFloat OldDaysTextureManager SavingManager
-        SMPManager OldDaysEasyLocalization GuiOldDaysBase GuiOldDaysSearch GuiTextFieldSearch GuiButtonProp OldDaysPropertyCond2"
-CP[11]="`find EntityLiving` `find EntityLivingBase` `find ItemRenderer`"
-ADD[11]="${ADD[1]} ${ADD[2]} ${ADD[3]} ${ADD[4]} ${ADD[5]} ${ADD[6]} ${ADD[7]} ${ADD[8]} ${ADD[9]} ${ADD[10]}"
-MV[12]="EntityHuman
-        ModelHuman
-        RenderHuman
-        mod_SpawnHuman"
-ADD[12]="./char.png"
-MV[13]="CommandClientSPC
-        EntityPlayerSPSPC
-        PlayerHelper
-        PlayerHelper\$1
-        Settings
-        SPCCheckVersion
-        SPCCommand
-        SPCEntity
-        SPCEntityCamera
-        SPCEntityInterface
-        SPCLocalConfiguration
-        SPCLocalPlayer
-        SPCLocalWorld
-        SPCObjectHit
-        SPCPlugin
-        SPCPluginManager
-        SPCPoint
-        SPCServerInterface
-        SPCVersion
-        SPCVersionInterface
-        SPCWorld
-        SPCWorldInterface
-        WorldEditPlugin
-        mod_SSPC
-        spc_WorldEdit
-        spc_paint
-        spc_path"
-MV[14]="net/ ssp/ other"
-#MV[14]="`find WorldInfo` `find GuiIngame` `find GuiContainer` `find GuiInventory` `find EntityRenderer` `find ItemRenderer`
-#        `find RenderBlocks` `find RenderGlobal` `find EntityLiving` `find EntityLivingBase` net/ ssp/ other"
-
-cd $ORIG_DIR_SERVER
-
-rm -rf $RESULT_DIR
-rm -rf $RESULT_DIR_2
-echo "CLIENT:"
-mkdir -p $RESULT_DIR/client/unused
-echo " UNUSED:"
-for f in $UNUSED; do
-    echo "  MV CLASS: $f1.class"
-    mv $ORIG_DIR/$f.class "$RESULT_DIR/client/unused/$f.class"
-done
-count=1;
-for f in $MODS_LIST; do
-    mkdir -p $RESULT_DIR/client/$f
-    echo " MOD: $f"
-    for f1 in ${MV[$count]}; do
-        if [ $f1 == "other" ]; then
-            echo "  MV ALL CLASSES"
-            for ff in *.class; do
-                mv $ORIG_DIR/$ff "$RESULT_DIR/client/$f"
-            done
-        elif [ ${f1: -1} == "/" ]; then
-            echo "  MV DIR: $f1"
-            mv "$ORIG_DIR/$f1" "$RESULT_DIR/client/$f"
-        else
-            echo "  MV CLASS: $f1.class"
-            mv "$ORIG_DIR/$f1.class" "$RESULT_DIR/client/$f/$f1.class"
-        fi
-    done;
-    for f1 in ${CP[$count]}; do
-        if [ $f1 == "other" ]; then
-            echo "  CP ALL CLASSES"
-            for ff in *.class; do
-                cp $ORIG_DIR/$ff "$RESULT_DIR/client/$f"
-            done
-        elif [ ${f1: -1} == "/" ]; then
-            echo "  CP DIR: $f1"
-            cp "$ORIG_DIR/$f1" "$RESULT_DIR/client/$f" -r
-        else
-            echo "  CP CLASS: $f1.class"
-            cp "$ORIG_DIR/$f1.class" "$RESULT_DIR/client/$f/$f1.class"
-        fi
-    done;
-    for f5 in ${ADD[$count]}; do
-        echo "  ADDITIONAL: $f5"
-        mkdir -p "$RESULT_DIR/client/$f/assets/minecraft/${f5%/*}"
-        cp -r "$ADDITIONAL_DIR/$f5" "$RESULT_DIR/client/$f/assets/minecraft/$f5"
-    done;
-    count=$count+1;
-done
-echo "ADD: WorldEdit.jar"
-cp -r "$DIR/../lib/WorldEdit.jar" "$RESULT_DIR/client/spc/WorldEdit.jar"
-echo "SERVER:"
-count=1;
-for f2 in $MODS_LIST_SERVER; do
-    mkdir -p $RESULT_DIR/server/$f2
-    echo " MOD: $f2"
-    for f3 in ${SERVER_MV[$count]}; do
-        if [ $f3 == "other" ]; then
-            echo "  MV ALL CLASSES"
-            for ff in *.class; do
-                mv $ORIG_DIR_SERVER/$ff "$RESULT_DIR/server/$f2"
-            done
-        elif [ ${f3: -1} == "/" ]; then
-            echo "  MV DIR: $f3"
-            mv "$ORIG_DIR_SERVER/$f3" "$RESULT_DIR/server/$f2"
-        else
-            echo "  MV CLASS: $f3.class"
-            mv "$ORIG_DIR_SERVER/$f3.class" "$RESULT_DIR/server/$f2/$f3.class"
-        fi
-    done;
-    for f3 in ${SERVER_CP[$count]}; do
-        if [ $f3 == "other" ]; then
-            echo "  CP ALL CLASSES"
-            for ff in *.class; do
-                cp $ORIG_DIR_SERVER/$ff "$RESULT_DIR/server/$f2"
-            done
-        elif [ ${f3: -1} == "/" ]; then
-            echo "  CP DIR: $f3"
-            cp "$ORIG_DIR_SERVER/$f3" "$RESULT_DIR/server/$f2" -r
-        else
-            echo "  CP CLASS: $f3.class"
-            cp "$ORIG_DIR_SERVER/$f3.class" "$RESULT_DIR/server/$f2/$f3.class"
-        fi
-    done;
-    count=$count+1;
-done;
-cd $RESULT_DIR/client
-mkdir -p $RESULT_DIR_2/client
-for F in *; do
-    echo "Packaging $F..."
-    cd $F
-    zip $RESULT_DIR_2/client/$F.zip * -r > /dev/null
-    cd ..
-done
-echo "Packaging source code..."
-cd $DIR/../src-mods/src/client/spc
-zip $RESULT_DIR_2/client/spc-src.zip * -r > /dev/null
-cd $DIR/../src-mods
-zip $RESULT_DIR_2/client/src.zip src/client/nbxlite src/client/olddays src/client/spawnhuman src/client/ssp src/client-* src/server build resources README.md -r > /dev/null
+cd ../..
+python src-mods/build/runtime/make.py "$@"
diff --git a/build/runtime/deploy.py b/build/runtime/deploy.py
new file mode 100644
index 00000000..2052b17f
--- /dev/null
+++ b/build/runtime/deploy.py
@@ -0,0 +1,42 @@
+import os, urllib, ctypes
+path = os.getcwd()
+
+def symlink(source, link_name):
+    os_symlink = getattr(os, "symlink", None)
+    if callable(os_symlink):
+        os_symlink(source, link_name)
+    else:
+        csl = ctypes.windll.kernel32.CreateSymbolicLinkW
+        csl.argtypes = (ctypes.c_wchar_p, ctypes.c_wchar_p, ctypes.c_uint32)
+        csl.restype = ctypes.c_ubyte
+        flags = 1 if os.path.isdir(source) else 0
+        if csl(link_name, source, flags) == 0:
+            raise ctypes.WinError()
+
+print("Gathering overwritten files list...")
+delsrc = [line.strip() for line in open( 'src-mods/build/conf_deploy/deploy_src.txt' )]
+delserver = [line.strip() for line in open('src-mods/build/conf_deploy/deploy_server.txt')]
+delclient = [line.strip() for line in open('src-mods/build/conf_deploy/deploy_client.txt')]
+
+print("Deleting files...")
+for filename in delsrc :
+    os.remove('src/minecraft/net/minecraft/src/' + filename)
+for filename in delserver :
+    os.remove('src/minecraft/net/minecraft/server/' + filename)
+for filename in delclient :
+    os.remove('src/minecraft/net/minecraft/client/' + filename)
+
+if os.path.isdir('lib/') == False:
+	os.makedirs(os.path.dirname('lib/'))
+	
+print("Downloading worldedit...")
+urllib.urlretrieve('http://dev.bukkit.org/media/files/715/447/worldedit-5.5.7.jar', 'lib/WorldEdit.jar')
+
+if os.path.isdir('reobf/') == False:
+	os.makedirs(os.path.dirname('reobf/'))
+
+print("Linking files and folder to the minecraft source directory...")
+links = [line.strip() for line in open( 'src-mods/build/conf_deploy/deploy_link.txt' )]
+for link in links :
+    Files = link.split()
+    symlink( path + Files[0], path + Files[1])
diff --git a/build/runtime/make.py b/build/runtime/make.py
new file mode 100644
index 00000000..4bf2fd85
--- /dev/null
+++ b/build/runtime/make.py
@@ -0,0 +1,148 @@
+import os, shutil, linecache, zipfile
+
+currentpath = os.getcwd() # Get the current directory
+RESULT_DIR  = "./reobf/result/" # Where the resulting compiled classes will be
+RESULT_DIR2 = "./reobf/result2/" # Where the resulting zips will be
+additional  = "./reobf/additional/" # Where the additional resources are
+reobf       = currentpath + "/reobf/minecraft/" # Where the reobfuscate folder is
+conf_mv     = currentpath + '/src-mods/build/conf_make/make_mv_%s.txt' # Location of the config for moving classes (%s is the mod name, don't touch)
+conf_cp     = currentpath + '/src-mods/build/conf_make/make_cp_%s.txt' # Location of the config for copying classes (%s is the mod name, don't touch)
+conf_add    = currentpath + '/src-mods/build/conf_make/make_add_%s.txt' # Location of the config for adding resources (%s is the mod name, don't touch)
+conf_unused = currentpath + '/src-mods/build/conf_make/make_unused.txt' # Location of the config for unused classes
+conf_mods   = currentpath + '/src-mods/build/conf_make/make_mods_list.txt' # Location of the config for the mods list
+srcdir      = [
+		"src-mods/README.md",
+		"src-mods/src/client/nbxlite/", 
+		"src-mods/src/client/olddays/", 
+		"src-mods/src/client/spawnhuman/", 
+		"src-mods/src/client/ssp/", 
+		"src-mods/src/client-client/", 
+		"src-mods/src/client-server/", 
+		"src-mods/src/server/", 
+		"src-mods/resources/", 
+		"src-mods/build/"
+	      ] # List of files / folders to include in the source zip
+
+spcsrcdir   = [
+		"src-mods/src/client/spc"
+	      ] # List of files / folders to include in the spc source zip
+			  
+# Find a class in /reobf/minecraft/ that contains the provided string in the first two lines
+def find(classname):
+	if os.path.exists(reobf + classname + ".class") == True:
+		print("Find: " + classname + ".class" + " --> " + classname + ".java")
+		return reobf + classname + ".class"
+	for root, dirs, files in os.walk(reobf):
+		for fileName in files:
+			line = linecache.getline(reobf + fileName, 1)
+			if line.find(classname + ".java") is not -1:
+				print("Find: " + fileName + " --> " + classname + ".java")
+				return reobf + fileName
+			line = linecache.getline(reobf + fileName, 2)
+			if line.find(classname + ".java") is not -1:
+				print("Find: " + fileName + " --> " + classname + ".java")
+				return reobf + fileName
+	print("Find : Not Found " + classname + ".class")
+	return
+
+# Universal copy function that automatically detect the type of the source and create automatically the folders for it
+def copy(src, dst):
+	if os.path.isdir(src) == True:
+		shutil.copytree(src, dst)
+		return
+	if not os.path.exists(os.path.dirname(dst)):
+		os.makedirs(os.path.dirname(dst))
+	shutil.copy(src, dst)
+
+# Universal move function that automatically detect the type of the source and create automatically the folders for it
+def move(src, dst):
+	if os.path.isdir(src) == True:
+		shutil.move(src, dst)
+		return
+	if not os.path.exists(os.path.dirname(dst)):
+		os.makedirs(os.path.dirname(dst))
+	shutil.move(src, dst)
+
+# Universal zip fonction that automatically detect the type of the source and write them into a zip file without the /src-mods/ folder
+def zipsrc(srcs, zip, replace):
+	src_zip = zipfile.ZipFile(zip, "w" )
+	for src in srcs:
+		if os.path.isdir(src):
+			for dir_, _, files in os.walk(src):
+				for fileName in files:
+					src_zip.write(dir_ + "/" + fileName, dir_.replace(replace, "") + "/" + fileName, zipfile.ZIP_DEFLATED)
+		else:
+			src_zip.write(src, src.replace(replace + "/", ""), zipfile.ZIP_DEFLATED )
+	
+# Detects the os and launches mcp scripts to get the latest deobfuscated code
+if os.name is "nt":
+	os.system("runtime\\bin\\python\\python_mcp.exe runtime\\recompile.py")
+	os.system("runtime\\bin\\python\\python_mcp.exe runtime\\reobfuscate.py")
+else:
+	os.system("python runtime/recompile.py")
+	os.system("python runtime/reobfuscate.py")
+
+# If the Result folder doesn't exist, create it
+if os.path.isdir(RESULT_DIR + "/client/") == False:
+	os.makedirs(os.path.dirname(RESULT_DIR + "/client/"))
+	
+# Place the unused files specified in the corresponding config file into the /unused/ folder
+for Unfile in [line.strip() for line in open(conf_unused)]:
+	if os.path.isdir(reobf + Unfile) == True:
+		move(reobf + Unfile, RESULT_DIR + "/client/unused/" + Unfile)
+	else:
+		move(reobf + Unfile + ".class", RESULT_DIR + "/client/unused/")
+
+# Read the mod list config file and move, copy or add the files specified in their configs
+for mod in [line.strip() for line in open(conf_mods)]:
+	if os.path.exists(conf_mv % (mod)):
+		mv = [line.strip() for line in open(conf_mv % (mod))]
+		for mvfilename in mv :
+			if os.path.isdir(reobf + mvfilename) == True:
+				move(reobf + mvfilename, RESULT_DIR + "/client/" + mod + "/" + mvfilename)
+			else: 
+				if mvfilename == "other":
+					for root, dirs, files in os.walk(reobf):
+						for file in files:
+							move(reobf + file, RESULT_DIR + "/client/" + mod + "/")
+				else:
+					file = find(mvfilename)
+					if file is not None:
+						move(file, RESULT_DIR + "/client/" + mod + "/")
+	if os.path.exists(conf_cp % (mod)):
+		cp = [line.strip() for line in open(conf_cp % (mod))]
+		for cpfilename in cp :
+			if os.path.isdir(reobf + cpfilename) == True:
+				copy(reobf + cpfilename, RESULT_DIR + "/client/" + mod + "/" + cpfilename)
+			else:
+				file = find(cpfilename)
+				if file is not None:
+					copy(file, RESULT_DIR + "/client/" + mod + "/")
+	if os.path.exists(conf_add % (mod)):
+		add = [line.strip() for line in open(conf_add % (mod))]
+		for addfilename in add :
+			copy(additional + addfilename, RESULT_DIR + "/client/" + mod + "/assets/minecraft/" + addfilename)
+
+# Add WorldEdit into the mods files
+print("Adding worldedit...")
+copy(currentpath + "/lib/WorldEdit.jar", RESULT_DIR + "/client/spc/WorldEdit.jar")
+
+# If the Result2 folder doesn't exist, create it
+if os.path.isdir(RESULT_DIR2 + "/client/") == False:
+	os.makedirs(os.path.dirname(RESULT_DIR2 + "/client/"))
+
+# Zip the compiled mods files
+for mod in [line.strip() for line in open(conf_mods)]:
+	print("Packaging " + mod + ".zip ...")
+	mod_zip = zipfile.ZipFile(RESULT_DIR2 + "/client/" + mod + ".zip", "w" )
+	for dir_, _, files in os.walk(RESULT_DIR + "/client/" + mod + "/"):
+		for fileName in files:
+			filepath = (dir_ + "/" + fileName).replace(RESULT_DIR + "/client/" + mod, "")
+			mod_zip.write(dir_ + "/" + fileName, filepath, zipfile.ZIP_DEFLATED)
+	
+# Zip the sources files specified in the header of this script
+print("Packaging source code ...")
+zipsrc(srcdir, RESULT_DIR2 + "/client/src.zip", "src-mods")
+
+print("Packaging spc source code ...")
+zipsrc(spcsrcdir, RESULT_DIR2 + "/client/spc-src.zip", "src-mods/src/client/spc")
diff --git a/build/wget-1.11.4.tar.gz b/build/wget-1.11.4.tar.gz
deleted file mode 100644
index b69cea9e..00000000
Binary files a/build/wget-1.11.4.tar.gz and /dev/null differ
diff --git a/build/wget.exe b/build/wget.exe
deleted file mode 100644
index f2a11c17..00000000
Binary files a/build/wget.exe and /dev/null differ