Schematics (#3513)

* Fixes and Spacewars Sifter. * Taiga Townhall 1 fixed * Fix Dwarven Farmer * Fix Medieval Birch Warehouse * Removed incorrect files, and rearranged decorations
ldtteam · Mar 24, 2019 · 1530401 · 1530401
1 parent 8a70e67
commit 1530401
Show file tree

Hide file tree

Showing 83 changed files with 0 additions and 0 deletions.
diff --git a/src/main/resources/assets/minecolonies/schematics/Acacia/Delivryman1.blueprint b/src/main/resources/assets/minecolonies/schematics/Acacia/Delivryman1.blueprint
diff --git a/src/main/resources/assets/minecolonies/schematics/Decorations/Well.blueprint~HEAD b/src/main/resources/assets/minecolonies/schematics/Decorations/Well.blueprint~HEAD
diff --git a/src/main/resources/assets/minecolonies/schematics/Dwarven/Farmer2.blueprint b/src/main/resources/assets/minecolonies/schematics/Dwarven/Farmer2.blueprint
diff --git a/src/main/resources/assets/minecolonies/schematics/Dwarven/Farmer3.blueprint b/src/main/resources/assets/minecolonies/schematics/Dwarven/Farmer3.blueprint
diff --git a/src/main/resources/assets/minecolonies/schematics/Dwarven/Farmer4.blueprint b/src/main/resources/assets/minecolonies/schematics/Dwarven/Farmer4.blueprint
diff --git a/src/main/resources/assets/minecolonies/schematics/Dwarven/Farmer5.blueprint b/src/main/resources/assets/minecolonies/schematics/Dwarven/Farmer5.blueprint
diff --git a/...s/Decorations/Fields/BasicField.blueprint → ...es/schematics/Fields/BasicField.blueprint b/...s/Decorations/Fields/BasicField.blueprint → ...es/schematics/Fields/BasicField.blueprint
diff --git a/...s/Decorations/Fields/CactusFarm.blueprint → ...es/schematics/Fields/CactusFarm.blueprint b/...s/Decorations/Fields/CactusFarm.blueprint → ...es/schematics/Fields/CactusFarm.blueprint
diff --git a/...s/Decorations/Fields/FancyField.blueprint → ...es/schematics/Fields/FancyField.blueprint b/...s/Decorations/Fields/FancyField.blueprint → ...es/schematics/Fields/FancyField.blueprint
diff --git a/...corations/Fields/NetherwartFarm.blueprint → ...chematics/Fields/NetherwartFarm.blueprint b/...corations/Fields/NetherwartFarm.blueprint → ...chematics/Fields/NetherwartFarm.blueprint
diff --git a/...ecorations/Fields/SugarcainFarm.blueprint → ...schematics/Fields/SugarcainFarm.blueprint b/...ecorations/Fields/SugarcainFarm.blueprint → ...schematics/Fields/SugarcainFarm.blueprint
diff --git a/...hematics/Decorations/ArcheryHut.blueprint → ...schematics/HutBlocks/ArcheryHut.blueprint b/...hematics/Decorations/ArcheryHut.blueprint → ...schematics/HutBlocks/ArcheryHut.blueprint
diff --git a/...schematics/Decorations/BakerHut.blueprint → ...s/schematics/HutBlocks/BakerHut.blueprint b/...schematics/Decorations/BakerHut.blueprint → ...s/schematics/HutBlocks/BakerHut.blueprint
diff --git a/...ematics/Decorations/BarracksHut.blueprint → ...chematics/HutBlocks/BarracksHut.blueprint b/...ematics/Decorations/BarracksHut.blueprint → ...chematics/HutBlocks/BarracksHut.blueprint
diff --git a/...cs/Decorations/BarracksTowerHut.blueprint → ...tics/HutBlocks/BarracksTowerHut.blueprint b/...cs/Decorations/BarracksTowerHut.blueprint → ...tics/HutBlocks/BarracksTowerHut.blueprint
diff --git a/...atics/Decorations/BlacksmithHut.blueprint → ...ematics/HutBlocks/BlacksmithHut.blueprint b/...atics/Decorations/BlacksmithHut.blueprint → ...ematics/HutBlocks/BlacksmithHut.blueprint
diff --git a/...hematics/Decorations/BuilderHut.blueprint → ...schematics/HutBlocks/BuilderHut.blueprint b/...hematics/Decorations/BuilderHut.blueprint → ...schematics/HutBlocks/BuilderHut.blueprint
diff --git a/...cs/Decorations/ChickenHerderHut.blueprint → ...tics/HutBlocks/ChickenHerderHut.blueprint b/...cs/Decorations/ChickenHerderHut.blueprint → ...tics/HutBlocks/ChickenHerderHut.blueprint
diff --git a/...hematics/Decorations/CitizenHut.blueprint → ...schematics/HutBlocks/CitizenHut.blueprint b/...hematics/Decorations/CitizenHut.blueprint → ...schematics/HutBlocks/CitizenHut.blueprint
diff --git a/...cs/Decorations/CombatAcademyHut.blueprint → ...tics/HutBlocks/CombatAcademyHut.blueprint b/...cs/Decorations/CombatAcademyHut.blueprint → ...tics/HutBlocks/CombatAcademyHut.blueprint
diff --git a/...matics/Decorations/ComposterHut.blueprint → ...hematics/HutBlocks/ComposterHut.blueprint b/...matics/Decorations/ComposterHut.blueprint → ...hematics/HutBlocks/ComposterHut.blueprint
diff --git a/.../schematics/Decorations/CookHut.blueprint → ...es/schematics/HutBlocks/CookHut.blueprint b/.../schematics/Decorations/CookHut.blueprint → ...es/schematics/HutBlocks/CookHut.blueprint
diff --git a/...chematics/Decorations/CowboyHut.blueprint → .../schematics/HutBlocks/CowboyHut.blueprint b/...chematics/Decorations/CowboyHut.blueprint → .../schematics/HutBlocks/CowboyHut.blueprint
diff --git a/...hematics/Decorations/CrusherHut.blueprint → ...schematics/HutBlocks/CrusherHut.blueprint b/...hematics/Decorations/CrusherHut.blueprint → ...schematics/HutBlocks/CrusherHut.blueprint
diff --git a/...tics/Decorations/DeliverymanHut.blueprint → ...matics/HutBlocks/DeliverymanHut.blueprint b/...tics/Decorations/DeliverymanHut.blueprint → ...matics/HutBlocks/DeliverymanHut.blueprint
diff --git a/...chematics/Decorations/FarmerHut.blueprint → .../schematics/HutBlocks/FarmerHut.blueprint b/...chematics/Decorations/FarmerHut.blueprint → .../schematics/HutBlocks/FarmerHut.blueprint
diff --git a/...matics/Decorations/FishermanHut.blueprint → ...hematics/HutBlocks/FishermanHut.blueprint b/...matics/Decorations/FishermanHut.blueprint → ...hematics/HutBlocks/FishermanHut.blueprint
diff --git a/...atics/Decorations/GuardTowerHut.blueprint → ...ematics/HutBlocks/GuardTowerHut.blueprint b/...atics/Decorations/GuardTowerHut.blueprint → ...ematics/HutBlocks/GuardTowerHut.blueprint
diff --git a/...hematics/Decorations/LibraryHut.blueprint → ...schematics/HutBlocks/LibraryHut.blueprint b/...hematics/Decorations/LibraryHut.blueprint → ...schematics/HutBlocks/LibraryHut.blueprint
diff --git a/...atics/Decorations/LumberjackHut.blueprint → ...ematics/HutBlocks/LumberjackHut.blueprint b/...atics/Decorations/LumberjackHut.blueprint → ...ematics/HutBlocks/LumberjackHut.blueprint
diff --git a/...schematics/Decorations/MinerHut.blueprint → ...s/schematics/HutBlocks/MinerHut.blueprint b/...schematics/Decorations/MinerHut.blueprint → ...s/schematics/HutBlocks/MinerHut.blueprint
diff --git a/...hematics/Decorations/SawmillHut.blueprint → ...schematics/HutBlocks/SawmillHut.blueprint b/...hematics/Decorations/SawmillHut.blueprint → ...schematics/HutBlocks/SawmillHut.blueprint
diff --git a/...matics/Decorations/ShepherdsHut.blueprint → ...hematics/HutBlocks/ShepherdsHut.blueprint b/...matics/Decorations/ShepherdsHut.blueprint → ...hematics/HutBlocks/ShepherdsHut.blueprint
diff --git a/...chematics/Decorations/SifterHut.blueprint → .../schematics/HutBlocks/SifterHut.blueprint b/...chematics/Decorations/SifterHut.blueprint → .../schematics/HutBlocks/SifterHut.blueprint
diff --git a/...ematics/Decorations/SmelteryHut.blueprint → ...chematics/HutBlocks/SmelteryHut.blueprint b/...ematics/Decorations/SmelteryHut.blueprint → ...chematics/HutBlocks/SmelteryHut.blueprint
diff --git a/...cs/Decorations/StoneSmelteryHut.blueprint → ...tics/HutBlocks/StoneSmelteryHut.blueprint b/...cs/Decorations/StoneSmelteryHut.blueprint → ...tics/HutBlocks/StoneSmelteryHut.blueprint
diff --git a/...atics/Decorations/StonemasonHut.blueprint → ...ematics/HutBlocks/StonemasonHut.blueprint b/...atics/Decorations/StonemasonHut.blueprint → ...ematics/HutBlocks/StonemasonHut.blueprint
diff --git a/...tics/Decorations/SwineHerderHut.blueprint → ...matics/HutBlocks/SwineHerderHut.blueprint b/...tics/Decorations/SwineHerderHut.blueprint → ...matics/HutBlocks/SwineHerderHut.blueprint
diff --git a/...ematics/Decorations/TownHallHut.blueprint → ...chematics/HutBlocks/TownHallHut.blueprint b/...ematics/Decorations/TownHallHut.blueprint → ...chematics/HutBlocks/TownHallHut.blueprint
diff --git a/...matics/Decorations/WareHouseHut.blueprint → ...hematics/HutBlocks/WareHouseHut.blueprint b/...matics/Decorations/WareHouseHut.blueprint → ...hematics/HutBlocks/WareHouseHut.blueprint
diff --git a/...rations/Markets/BlackMiniMarket.blueprint → ...ematics/Markets/BlackMiniMarket.blueprint b/...rations/Markets/BlackMiniMarket.blueprint → ...ematics/Markets/BlackMiniMarket.blueprint
diff --git a/...orations/Markets/BlueMiniMarket.blueprint → ...hematics/Markets/BlueMiniMarket.blueprint b/...orations/Markets/BlueMiniMarket.blueprint → ...hematics/Markets/BlueMiniMarket.blueprint
diff --git a/...rations/Markets/BrownMiniMarket.blueprint → ...ematics/Markets/BrownMiniMarket.blueprint b/...rations/Markets/BrownMiniMarket.blueprint → ...ematics/Markets/BrownMiniMarket.blueprint
diff --git a/...orations/Markets/CyanMiniMarket.blueprint → ...hematics/Markets/CyanMiniMarket.blueprint b/...orations/Markets/CyanMiniMarket.blueprint → ...hematics/Markets/CyanMiniMarket.blueprint
diff --git a/...orations/Markets/GrayMiniMarket.blueprint → ...hematics/Markets/GrayMiniMarket.blueprint b/...orations/Markets/GrayMiniMarket.blueprint → ...hematics/Markets/GrayMiniMarket.blueprint
diff --git a/...rations/Markets/GreenMiniMarket.blueprint → ...ematics/Markets/GreenMiniMarket.blueprint b/...rations/Markets/GreenMiniMarket.blueprint → ...ematics/Markets/GreenMiniMarket.blueprint
diff --git a/...ons/Markets/LightBlueMiniMarket.blueprint → ...ics/Markets/LightBlueMiniMarket.blueprint b/...ons/Markets/LightBlueMiniMarket.blueprint → ...ics/Markets/LightBlueMiniMarket.blueprint
diff --git a/...ons/Markets/LightGrayMiniMarket.blueprint → ...ics/Markets/LightGrayMiniMarket.blueprint b/...ons/Markets/LightGrayMiniMarket.blueprint → ...ics/Markets/LightGrayMiniMarket.blueprint
diff --git a/...orations/Markets/LimeMiniMarket.blueprint → ...hematics/Markets/LimeMiniMarket.blueprint b/...orations/Markets/LimeMiniMarket.blueprint → ...hematics/Markets/LimeMiniMarket.blueprint
diff --git a/...tions/Markets/MagentaMiniMarket.blueprint → ...atics/Markets/MagentaMiniMarket.blueprint b/...tions/Markets/MagentaMiniMarket.blueprint → ...atics/Markets/MagentaMiniMarket.blueprint
diff --git a/...ecorations/Markets/MarketSquare.blueprint → ...schematics/Markets/MarketSquare.blueprint b/...ecorations/Markets/MarketSquare.blueprint → ...schematics/Markets/MarketSquare.blueprint
diff --git a/...Decorations/Markets/Marketplace.blueprint → .../schematics/Markets/Marketplace.blueprint b/...Decorations/Markets/Marketplace.blueprint → .../schematics/Markets/Marketplace.blueprint
diff --git a/...ations/Markets/OrangeMiniMarket.blueprint → ...matics/Markets/OrangeMiniMarket.blueprint b/...ations/Markets/OrangeMiniMarket.blueprint → ...matics/Markets/OrangeMiniMarket.blueprint
diff --git a/...orations/Markets/PinkMiniMarket.blueprint → ...hematics/Markets/PinkMiniMarket.blueprint b/...orations/Markets/PinkMiniMarket.blueprint → ...hematics/Markets/PinkMiniMarket.blueprint
diff --git a/...ations/Markets/PurpleMiniMarket.blueprint → ...matics/Markets/PurpleMiniMarket.blueprint b/...ations/Markets/PurpleMiniMarket.blueprint → ...matics/Markets/PurpleMiniMarket.blueprint
diff --git a/...corations/Markets/RedMiniMarket.blueprint → ...chematics/Markets/RedMiniMarket.blueprint b/...corations/Markets/RedMiniMarket.blueprint → ...chematics/Markets/RedMiniMarket.blueprint
diff --git a/...ations/Markets/YellowMiniMarket.blueprint → ...matics/Markets/YellowMiniMarket.blueprint b/...ations/Markets/YellowMiniMarket.blueprint → ...matics/Markets/YellowMiniMarket.blueprint
diff --git a/src/main/resources/assets/minecolonies/schematics/Medieval Birch/WareHouse1.blueprint b/src/main/resources/assets/minecolonies/schematics/Medieval Birch/WareHouse1.blueprint
diff --git a/src/main/resources/assets/minecolonies/schematics/Medieval Birch/WareHouse2.blueprint b/src/main/resources/assets/minecolonies/schematics/Medieval Birch/WareHouse2.blueprint
diff --git a/src/main/resources/assets/minecolonies/schematics/Medieval Birch/WareHouse3.blueprint b/src/main/resources/assets/minecolonies/schematics/Medieval Birch/WareHouse3.blueprint
diff --git a/src/main/resources/assets/minecolonies/schematics/Medieval Birch/WareHouse4.blueprint b/src/main/resources/assets/minecolonies/schematics/Medieval Birch/WareHouse4.blueprint
diff --git a/src/main/resources/assets/minecolonies/schematics/Medieval Birch/WareHouse5.blueprint b/src/main/resources/assets/minecolonies/schematics/Medieval Birch/WareHouse5.blueprint
diff --git a/src/main/resources/assets/minecolonies/schematics/Medieval DarkOak/Barrack4.blueprint b/src/main/resources/assets/minecolonies/schematics/Medieval DarkOak/Barrack4.blueprint
diff --git a/...hematics/Decorations/Misc/Beach.blueprint → ...ecolonies/schematics/Misc/Beach.blueprint b/...hematics/Decorations/Misc/Beach.blueprint → ...ecolonies/schematics/Misc/Beach.blueprint
diff --git a/...ematics/Decorations/Misc/Gezebo.blueprint → ...colonies/schematics/Misc/Gezebo.blueprint b/...ematics/Decorations/Misc/Gezebo.blueprint → ...colonies/schematics/Misc/Gezebo.blueprint
diff --git a/...Decorations/Misc/SimpleFountain.blueprint → .../schematics/Misc/SimpleFountain.blueprint b/...Decorations/Misc/SimpleFountain.blueprint → .../schematics/Misc/SimpleFountain.blueprint
diff --git a/...ematics/Decorations/Misc/Stable.blueprint → ...colonies/schematics/Misc/Stable.blueprint b/...ematics/Decorations/Misc/Stable.blueprint → ...colonies/schematics/Misc/Stable.blueprint
diff --git a/...cs/Decorations/Misc/TownLibrary.blueprint → ...ies/schematics/Misc/TownLibrary.blueprint b/...cs/Decorations/Misc/TownLibrary.blueprint → ...ies/schematics/Misc/TownLibrary.blueprint
diff --git a/...chematics/Decorations/Misc/Well.blueprint → ...necolonies/schematics/Misc/Well.blueprint b/...chematics/Decorations/Misc/Well.blueprint → ...necolonies/schematics/Misc/Well.blueprint
diff --git a/...ics/Decorations/Parks/HedgeMaze.blueprint → ...nies/schematics/Parks/HedgeMaze.blueprint b/...ics/Decorations/Parks/HedgeMaze.blueprint → ...nies/schematics/Parks/HedgeMaze.blueprint
diff --git a/...cs/Decorations/Parks/Playground.blueprint → ...ies/schematics/Parks/Playground.blueprint b/...cs/Decorations/Parks/Playground.blueprint → ...ies/schematics/Parks/Playground.blueprint
diff --git a/...corations/Ships/big_pirate_ship.blueprint → ...chematics/Ships/big_pirate_ship.blueprint b/...corations/Ships/big_pirate_ship.blueprint → ...chematics/Ships/big_pirate_ship.blueprint
diff --git a/...ations/Ships/medium_pirate_ship.blueprint → ...matics/Ships/medium_pirate_ship.blueprint b/...ations/Ships/medium_pirate_ship.blueprint → ...matics/Ships/medium_pirate_ship.blueprint
diff --git a/...rations/Ships/small_pirate_ship.blueprint → ...ematics/Ships/small_pirate_ship.blueprint b/...rations/Ships/small_pirate_ship.blueprint → ...ematics/Ships/small_pirate_ship.blueprint
diff --git a/...ations/Statues/StatueArmsRaised.blueprint → ...matics/Statues/StatueArmsRaised.blueprint b/...ations/Statues/StatueArmsRaised.blueprint → ...matics/Statues/StatueArmsRaised.blueprint
diff --git a/...Decorations/Statues/StatueChair.blueprint → .../schematics/Statues/StatueChair.blueprint b/...Decorations/Statues/StatueChair.blueprint → .../schematics/Statues/StatueChair.blueprint
diff --git a/...ecorations/Statues/StatueFlower.blueprint → ...schematics/Statues/StatueFlower.blueprint b/...ecorations/Statues/StatueFlower.blueprint → ...schematics/Statues/StatueFlower.blueprint
diff --git a/...corations/Statues/StatuePosiden.blueprint → ...chematics/Statues/StatuePosiden.blueprint b/...corations/Statues/StatuePosiden.blueprint → ...chematics/Statues/StatuePosiden.blueprint
diff --git a/...corations/Statues/StatuePresent.blueprint → ...chematics/Statues/StatuePresent.blueprint b/...corations/Statues/StatuePresent.blueprint → ...chematics/Statues/StatuePresent.blueprint
diff --git a/...Decorations/Statues/StatueStaff.blueprint → .../schematics/Statues/StatueStaff.blueprint b/...Decorations/Statues/StatueStaff.blueprint → .../schematics/Statues/StatueStaff.blueprint
diff --git a/...tions/Statues/StatueSwordShield.blueprint → ...atics/Statues/StatueSwordShield.blueprint b/...tions/Statues/StatueSwordShield.blueprint → ...atics/Statues/StatueSwordShield.blueprint
diff --git a/...ecorations/Statues/StatueWeight.blueprint → ...schematics/Statues/StatueWeight.blueprint b/...ecorations/Statues/StatueWeight.blueprint → ...schematics/Statues/StatueWeight.blueprint
diff --git a/src/main/resources/assets/minecolonies/schematics/Taiga/TownHall1.blueprint b/src/main/resources/assets/minecolonies/schematics/Taiga/TownHall1.blueprint