From 8d082306da7141cd5de4c93a8198cd764684654f Mon Sep 17 00:00:00 2001 From: Robert Date: Thu, 19 Dec 2013 23:53:25 -0500 Subject: [PATCH] moved FM to main file --- FM/.gitattributes | 33 ------- FM/.gitignore | 1 - FM/LICENSE.txt | 91 ------------------ FM/README.md | 16 --- README.md | 15 +-- docs/BeltItemFluidFiller.txt | 1 + {FM/docs => docs}/BoilerSystemDesign.png | Bin {FM/docs => docs}/HRSG_FLOW-DIAGRAM.jpg | Bin {FM/docs => docs}/Hydroelectric_dam.svg.png | Bin FM/docs/Plan.txt => docs/Plan (2).txt | 0 {FM/docs => docs}/beer-production.jpg | Bin {FM/docs => docs}/steam-boiler-ft-a.gif | Bin {FM/docs => docs}/tanks.txt | 0 {FM/models => models}/Archive/BOILER TANK.tcn | Bin {FM/models => models}/Archive/CornerTank.tcn | Bin {FM/models => models}/Archive/Generator.tcn | Bin {FM/models => models}/Archive/Pump.tcn | Bin .../Archive/STEAM ENGINE.tcn | Bin {FM/models => models}/Archive/SteamPiston.tcn | Bin {FM/models => models}/Archive/TankCorner2.tcn | Bin {FM/models => models}/Archive/TankSingle2.tcn | Bin {FM/models => models}/Archive/furnace.tcn | Bin .../Archive/submittedPipe.tcn | Bin .../Current_Models/BasicPump.tcn | Bin .../Current_Models/ConstructionPump.tcn | Bin .../Current_Models/GearShaft.tcn | Bin .../Current_Models/GearShaftPiston.tcn | Bin .../Current_Models/Generator.tcn | Bin .../Current_Models/HandValve.tcn | Bin .../Current_Models/LargePipe.tcn | Bin .../Current_Models/MechRod.tcn | Bin .../Current_Models/Piston.tcn | Bin {FM/models => models}/Current_Models/Sink.tcn | Bin {FM/models => models}/Current_Models/Tank.tcn | Bin .../Current_Models/TankSide.java | 0 .../Current_Models/TankSide.png | Bin {FM/models => models}/Current_Models/pipe.tcn | Bin {FM/models => models}/WIP/Condensor.tcn | Bin {FM/models => models}/WIP/WindMill.tcn | Bin {FM/models => models}/WIP/tube.tcn | Bin {FM/models => models}/rejected/Pump3.tcn | Bin {FM/models => models}/rejected/PumpV2.tcn | Bin {FM/models => models}/rejected/something.tcn | Bin .../assets/FM_Banner.png | Bin .../assets/fm/languages/de_DE.properties | 0 .../assets/fm/languages/en_US.properties | 0 .../assets/fm/languages/zh_CN.properties | 0 .../assets/fm/textures/blocks/drain.png | Bin .../assets/fm/textures/blocks/drain2.png | Bin .../fm/textures/blocks/inputMachineSide.png | Bin .../fm/textures/blocks/ironMachineSide.png | Bin .../assets/fm/textures/blocks/iron_block.png | Bin .../assets/fm/textures/blocks/obsidian.png | Bin .../fm/textures/blocks/outputMachineSide.png | Bin .../assets/fm/textures/guis/SteamGUI.png | Bin .../assets/fm/textures/items/GuardKit.png | Bin .../assets/fm/textures/items/items.png | Bin .../fm/textures/models/ConstructionPump.png | Bin .../assets/fm/textures/models/CornerTank.png | Bin .../assets/fm/textures/models/Furnace.png | Bin .../fm/textures/models/GearShaftPiston.png | Bin .../fm/textures/models/ReleaseValve.png | Bin .../assets/fm/textures/models/Sink.png | Bin .../assets/fm/textures/models/TankSide.png | Bin .../fm/textures/models/gear_shaft_piston.png | Bin .../fm/textures/models/mechanical/GearRod.png | Bin .../textures/models/mechanical/Generator.png | Bin .../fm/textures/models/pipes/BlackPipe.png | Bin .../fm/textures/models/pipes/BluePipe.png | Bin .../fm/textures/models/pipes/BrownPipe.png | Bin .../fm/textures/models/pipes/CyanPipe.png | Bin .../fm/textures/models/pipes/GreenPipe.png | Bin .../fm/textures/models/pipes/GreyPipe.png | Bin .../fm/textures/models/pipes/LavaPipe.png | Bin .../textures/models/pipes/LightBluePipe.png | Bin .../fm/textures/models/pipes/LimePipe.png | Bin .../fm/textures/models/pipes/MagentaPipe.png | Bin .../fm/textures/models/pipes/OrangePipe.png | Bin .../fm/textures/models/pipes/PinkPipe.png | Bin .../assets/fm/textures/models/pipes/Pipe.png | Bin .../fm/textures/models/pipes/PurplePipe.png | Bin .../fm/textures/models/pipes/RedPipe.png | Bin .../fm/textures/models/pipes/SilverPipe.png | Bin .../fm/textures/models/pipes/WhitePipe.png | Bin .../fm/textures/models/pipes/YellowPipe.png | Bin .../fm/textures/models/pipes/bronze/Pipe.png | Bin .../fm/textures/models/pipes/copper/Pipe.png | Bin .../fm/textures/models/pipes/glass/Pipe.png | Bin .../fm/textures/models/pipes/gold/Pipe.png | Bin .../fm/textures/models/pipes/hell/Pipe.png | Bin .../fm/textures/models/pipes/iron/Pipe.png | Bin .../fm/textures/models/pipes/obby/Pipe.png | Bin .../fm/textures/models/pipes/steel/Pipe.png | Bin .../fm/textures/models/pipes/stone/Pipe.png | Bin .../fm/textures/models/pipes/tin/Pipe.png | Bin .../fm/textures/models/pipes/wood/Pipe.png | Bin .../fm/textures/models/pumps/WaterPump.png | Bin .../assets/fm/textures/models/tankBlock.png | Bin .../assets/fm/textures/models/tankTexture.png | Bin {FM/src => src}/dark/api/fluid/IDrain.java | 0 .../dark/api/fluid/INetworkFluidPart.java | 0 .../dark/api/fluid/INetworkPipe.java | 0 .../fluid/FluidCraftingHandler.java | 0 .../tilenetwork/fluid/FluidPressurePack.java | 0 .../tilenetwork/fluid/FluidRecipeInfo.java | 0 .../fluid/IFluidRecipeCrafter.java | 0 .../fluid/NetworkFluidContainers.java | 0 .../tilenetwork/fluid/NetworkFluidTiles.java | 0 .../tilenetwork/fluid/NetworkPipes.java | 0 .../dark/fluid/client/ClientProxy.java | 0 .../fluid/client/model/ModelCenterTank.java | 0 .../client/model/ModelConstructionPump.java | 0 .../fluid/client/model/ModelCornerTank.java | 0 .../dark/fluid/client/model/ModelEngine.java | 0 .../dark/fluid/client/model/ModelFurnace.java | 0 .../fluid/client/model/ModelGearPiston.java | 0 .../fluid/client/model/ModelGenerator.java | 0 .../fluid/client/model/ModelLargePipe.java | 0 .../client/model/ModelLiquidTankCorner.java | 0 .../dark/fluid/client/model/ModelPump.java | 0 .../fluid/client/model/ModelReleaseValve.java | 0 .../dark/fluid/client/model/ModelSink.java | 0 .../dark/fluid/client/model/ModelTank.java | 0 .../fluid/client/model/ModelTankSide.java | 0 .../client/render/BlockRenderHelper.java | 0 .../fluid/client/render/ItemPipeRenderer.java | 0 .../fluid/client/render/ItemTankRenderer.java | 0 .../client/render/RenderConstructionPump.java | 0 .../fluid/client/render/RenderFurnace.java | 0 .../fluid/client/render/RenderGearPiston.java | 0 .../dark/fluid/client/render/RenderPipe.java | 0 .../dark/fluid/client/render/RenderPump.java | 0 .../client/render/RenderReleaseValve.java | 0 .../dark/fluid/client/render/RenderSink.java | 0 .../dark/fluid/client/render/RenderTank.java | 0 .../dark/fluid/common/CommonProxy.java | 0 .../dark/fluid/common/FMRecipeLoader.java | 0 .../dark/fluid/common/FluidMech.java | 0 .../dark/fluid/common/FluidPartsMaterial.java | 0 .../dark/fluid/common/machines/BlockFM.java | 0 .../common/machines/BlockReleaseValve.java | 0 .../dark/fluid/common/machines/BlockSink.java | 0 .../dark/fluid/common/machines/BlockTank.java | 0 .../machines/TileEntityReleaseValve.java | 0 .../fluid/common/machines/TileEntitySink.java | 0 .../fluid/common/machines/TileEntityTank.java | 0 .../dark/fluid/common/pipes/BlockPipe.java | 0 .../dark/fluid/common/pipes/EnumPipeType.java | 0 .../fluid/common/pipes/EnumTankTypes.java | 0 .../dark/fluid/common/pipes/IPipeType.java | 0 .../fluid/common/pipes/ItemBlockPipe.java | 0 .../common/pipes/ThreadFluidNetwork.java | 0 .../fluid/common/pipes/TileEntityPipe.java | 0 .../common/pipes/tele/INetworkConnector.java | 0 .../common/prefab/TileEntityFluidDevice.java | 0 .../prefab/TileEntityFluidNetworkTile.java | 0 .../common/prefab/TileEntityFluidStorage.java | 0 .../common/pump/BlockConstructionPump.java | 0 .../dark/fluid/common/pump/BlockDrain.java | 0 .../fluid/common/pump/BlockPumpMachine.java | 0 .../fluid/common/pump/LiquidPathFinder.java | 0 .../pump/TileEntityConstructionPump.java | 0 .../fluid/common/pump/TileEntityDrain.java | 0 .../common/pump/TileEntityStarterPump.java | 0 .../dark/mech/client/model/ModelGearRod.java | 0 .../mech/client/model/ModelGenerator.java | 0 .../mech/client/render/RenderGearRod.java | 0 .../mech/client/render/RenderGenerator.java | 0 .../machines/BlockMechanicalGenerator.java | 0 .../dark/mech/common/machines/BlockRod.java | 0 .../common/machines/BlockSteamPiston.java | 0 .../machines/TileEntitySteamPiston.java | 0 .../blockSorterTest/README.txt | 0 .../blockSorterTest/co/Main.java | 0 174 files changed, 9 insertions(+), 148 deletions(-) delete mode 100644 FM/.gitattributes delete mode 100644 FM/.gitignore delete mode 100644 FM/LICENSE.txt delete mode 100644 FM/README.md create mode 100644 docs/BeltItemFluidFiller.txt rename {FM/docs => docs}/BoilerSystemDesign.png (100%) rename {FM/docs => docs}/HRSG_FLOW-DIAGRAM.jpg (100%) rename {FM/docs => docs}/Hydroelectric_dam.svg.png (100%) rename FM/docs/Plan.txt => docs/Plan (2).txt (100%) rename {FM/docs => docs}/beer-production.jpg (100%) rename {FM/docs => docs}/steam-boiler-ft-a.gif (100%) rename {FM/docs => docs}/tanks.txt (100%) rename {FM/models => models}/Archive/BOILER TANK.tcn (100%) rename {FM/models => models}/Archive/CornerTank.tcn (100%) rename {FM/models => models}/Archive/Generator.tcn (100%) rename {FM/models => models}/Archive/Pump.tcn (100%) rename {FM/models => models}/Archive/STEAM ENGINE.tcn (100%) rename {FM/models => models}/Archive/SteamPiston.tcn (100%) rename {FM/models => models}/Archive/TankCorner2.tcn (100%) rename {FM/models => models}/Archive/TankSingle2.tcn (100%) rename {FM/models => models}/Archive/furnace.tcn (100%) rename {FM/models => models}/Archive/submittedPipe.tcn (100%) rename {FM/models => models}/Current_Models/BasicPump.tcn (100%) rename {FM/models => models}/Current_Models/ConstructionPump.tcn (100%) rename {FM/models => models}/Current_Models/GearShaft.tcn (100%) rename {FM/models => models}/Current_Models/GearShaftPiston.tcn (100%) rename {FM/models => models}/Current_Models/Generator.tcn (100%) rename {FM/models => models}/Current_Models/HandValve.tcn (100%) rename {FM/models => models}/Current_Models/LargePipe.tcn (100%) rename {FM/models => models}/Current_Models/MechRod.tcn (100%) rename {FM/models => models}/Current_Models/Piston.tcn (100%) rename {FM/models => models}/Current_Models/Sink.tcn (100%) rename {FM/models => models}/Current_Models/Tank.tcn (100%) rename {FM/models => models}/Current_Models/TankSide.java (100%) rename {FM/models => models}/Current_Models/TankSide.png (100%) rename {FM/models => models}/Current_Models/pipe.tcn (100%) rename {FM/models => models}/WIP/Condensor.tcn (100%) rename {FM/models => models}/WIP/WindMill.tcn (100%) rename {FM/models => models}/WIP/tube.tcn (100%) rename {FM/models => models}/rejected/Pump3.tcn (100%) rename {FM/models => models}/rejected/PumpV2.tcn (100%) rename {FM/models => models}/rejected/something.tcn (100%) rename {FM/resources => resources}/assets/FM_Banner.png (100%) rename {FM/resources => resources}/assets/fm/languages/de_DE.properties (100%) rename {FM/resources => resources}/assets/fm/languages/en_US.properties (100%) rename {FM/resources => resources}/assets/fm/languages/zh_CN.properties (100%) rename {FM/resources => resources}/assets/fm/textures/blocks/drain.png (100%) rename {FM/resources => resources}/assets/fm/textures/blocks/drain2.png (100%) rename {FM/resources => resources}/assets/fm/textures/blocks/inputMachineSide.png (100%) rename {FM/resources => resources}/assets/fm/textures/blocks/ironMachineSide.png (100%) rename {FM/resources => resources}/assets/fm/textures/blocks/iron_block.png (100%) rename {FM/resources => resources}/assets/fm/textures/blocks/obsidian.png (100%) rename {FM/resources => resources}/assets/fm/textures/blocks/outputMachineSide.png (100%) rename {FM/resources => resources}/assets/fm/textures/guis/SteamGUI.png (100%) rename {FM/resources => resources}/assets/fm/textures/items/GuardKit.png (100%) rename {FM/resources => resources}/assets/fm/textures/items/items.png (100%) rename {FM/resources => resources}/assets/fm/textures/models/ConstructionPump.png (100%) rename {FM/resources => resources}/assets/fm/textures/models/CornerTank.png (100%) rename {FM/resources => resources}/assets/fm/textures/models/Furnace.png (100%) rename {FM/resources => resources}/assets/fm/textures/models/GearShaftPiston.png (100%) rename {FM/resources => resources}/assets/fm/textures/models/ReleaseValve.png (100%) rename {FM/resources => resources}/assets/fm/textures/models/Sink.png (100%) rename {FM/resources => resources}/assets/fm/textures/models/TankSide.png (100%) rename {FM/resources => resources}/assets/fm/textures/models/gear_shaft_piston.png (100%) rename {FM/resources => resources}/assets/fm/textures/models/mechanical/GearRod.png (100%) rename {FM/resources => resources}/assets/fm/textures/models/mechanical/Generator.png (100%) rename {FM/resources => resources}/assets/fm/textures/models/pipes/BlackPipe.png (100%) rename {FM/resources => resources}/assets/fm/textures/models/pipes/BluePipe.png (100%) rename {FM/resources => resources}/assets/fm/textures/models/pipes/BrownPipe.png (100%) rename {FM/resources => resources}/assets/fm/textures/models/pipes/CyanPipe.png (100%) rename {FM/resources => resources}/assets/fm/textures/models/pipes/GreenPipe.png (100%) rename {FM/resources => resources}/assets/fm/textures/models/pipes/GreyPipe.png (100%) rename {FM/resources => resources}/assets/fm/textures/models/pipes/LavaPipe.png (100%) rename {FM/resources => resources}/assets/fm/textures/models/pipes/LightBluePipe.png (100%) rename {FM/resources => resources}/assets/fm/textures/models/pipes/LimePipe.png (100%) rename {FM/resources => resources}/assets/fm/textures/models/pipes/MagentaPipe.png (100%) rename {FM/resources => resources}/assets/fm/textures/models/pipes/OrangePipe.png (100%) rename {FM/resources => resources}/assets/fm/textures/models/pipes/PinkPipe.png (100%) rename {FM/resources => resources}/assets/fm/textures/models/pipes/Pipe.png (100%) rename {FM/resources => resources}/assets/fm/textures/models/pipes/PurplePipe.png (100%) rename {FM/resources => resources}/assets/fm/textures/models/pipes/RedPipe.png (100%) rename {FM/resources => resources}/assets/fm/textures/models/pipes/SilverPipe.png (100%) rename {FM/resources => resources}/assets/fm/textures/models/pipes/WhitePipe.png (100%) rename {FM/resources => resources}/assets/fm/textures/models/pipes/YellowPipe.png (100%) rename {FM/resources => resources}/assets/fm/textures/models/pipes/bronze/Pipe.png (100%) rename {FM/resources => resources}/assets/fm/textures/models/pipes/copper/Pipe.png (100%) rename {FM/resources => resources}/assets/fm/textures/models/pipes/glass/Pipe.png (100%) rename {FM/resources => resources}/assets/fm/textures/models/pipes/gold/Pipe.png (100%) rename {FM/resources => resources}/assets/fm/textures/models/pipes/hell/Pipe.png (100%) rename {FM/resources => resources}/assets/fm/textures/models/pipes/iron/Pipe.png (100%) rename {FM/resources => resources}/assets/fm/textures/models/pipes/obby/Pipe.png (100%) rename {FM/resources => resources}/assets/fm/textures/models/pipes/steel/Pipe.png (100%) rename {FM/resources => resources}/assets/fm/textures/models/pipes/stone/Pipe.png (100%) rename {FM/resources => resources}/assets/fm/textures/models/pipes/tin/Pipe.png (100%) rename {FM/resources => resources}/assets/fm/textures/models/pipes/wood/Pipe.png (100%) rename {FM/resources => resources}/assets/fm/textures/models/pumps/WaterPump.png (100%) rename {FM/resources => resources}/assets/fm/textures/models/tankBlock.png (100%) rename {FM/resources => resources}/assets/fm/textures/models/tankTexture.png (100%) rename {FM/src => src}/dark/api/fluid/IDrain.java (100%) rename {FM/src => src}/dark/api/fluid/INetworkFluidPart.java (100%) rename {FM/src => src}/dark/api/fluid/INetworkPipe.java (100%) rename {FM/src => src}/dark/core/prefab/tilenetwork/fluid/FluidCraftingHandler.java (100%) rename {FM/src => src}/dark/core/prefab/tilenetwork/fluid/FluidPressurePack.java (100%) rename {FM/src => src}/dark/core/prefab/tilenetwork/fluid/FluidRecipeInfo.java (100%) rename {FM/src => src}/dark/core/prefab/tilenetwork/fluid/IFluidRecipeCrafter.java (100%) rename {FM/src => src}/dark/core/prefab/tilenetwork/fluid/NetworkFluidContainers.java (100%) rename {FM/src => src}/dark/core/prefab/tilenetwork/fluid/NetworkFluidTiles.java (100%) rename {FM/src => src}/dark/core/prefab/tilenetwork/fluid/NetworkPipes.java (100%) rename {FM/src => src}/dark/fluid/client/ClientProxy.java (100%) rename {FM/src => src}/dark/fluid/client/model/ModelCenterTank.java (100%) rename {FM/src => src}/dark/fluid/client/model/ModelConstructionPump.java (100%) rename {FM/src => src}/dark/fluid/client/model/ModelCornerTank.java (100%) rename {FM/src => src}/dark/fluid/client/model/ModelEngine.java (100%) rename {FM/src => src}/dark/fluid/client/model/ModelFurnace.java (100%) rename {FM/src => src}/dark/fluid/client/model/ModelGearPiston.java (100%) rename {FM/src => src}/dark/fluid/client/model/ModelGenerator.java (100%) rename {FM/src => src}/dark/fluid/client/model/ModelLargePipe.java (100%) rename {FM/src => src}/dark/fluid/client/model/ModelLiquidTankCorner.java (100%) rename {FM/src => src}/dark/fluid/client/model/ModelPump.java (100%) rename {FM/src => src}/dark/fluid/client/model/ModelReleaseValve.java (100%) rename {FM/src => src}/dark/fluid/client/model/ModelSink.java (100%) rename {FM/src => src}/dark/fluid/client/model/ModelTank.java (100%) rename {FM/src => src}/dark/fluid/client/model/ModelTankSide.java (100%) rename {FM/src => src}/dark/fluid/client/render/BlockRenderHelper.java (100%) rename {FM/src => src}/dark/fluid/client/render/ItemPipeRenderer.java (100%) rename {FM/src => src}/dark/fluid/client/render/ItemTankRenderer.java (100%) rename {FM/src => src}/dark/fluid/client/render/RenderConstructionPump.java (100%) rename {FM/src => src}/dark/fluid/client/render/RenderFurnace.java (100%) rename {FM/src => src}/dark/fluid/client/render/RenderGearPiston.java (100%) rename {FM/src => src}/dark/fluid/client/render/RenderPipe.java (100%) rename {FM/src => src}/dark/fluid/client/render/RenderPump.java (100%) rename {FM/src => src}/dark/fluid/client/render/RenderReleaseValve.java (100%) rename {FM/src => src}/dark/fluid/client/render/RenderSink.java (100%) rename {FM/src => src}/dark/fluid/client/render/RenderTank.java (100%) rename {FM/src => src}/dark/fluid/common/CommonProxy.java (100%) rename {FM/src => src}/dark/fluid/common/FMRecipeLoader.java (100%) rename {FM/src => src}/dark/fluid/common/FluidMech.java (100%) rename {FM/src => src}/dark/fluid/common/FluidPartsMaterial.java (100%) rename {FM/src => src}/dark/fluid/common/machines/BlockFM.java (100%) rename {FM/src => src}/dark/fluid/common/machines/BlockReleaseValve.java (100%) rename {FM/src => src}/dark/fluid/common/machines/BlockSink.java (100%) rename {FM/src => src}/dark/fluid/common/machines/BlockTank.java (100%) rename {FM/src => src}/dark/fluid/common/machines/TileEntityReleaseValve.java (100%) rename {FM/src => src}/dark/fluid/common/machines/TileEntitySink.java (100%) rename {FM/src => src}/dark/fluid/common/machines/TileEntityTank.java (100%) rename {FM/src => src}/dark/fluid/common/pipes/BlockPipe.java (100%) rename {FM/src => src}/dark/fluid/common/pipes/EnumPipeType.java (100%) rename {FM/src => src}/dark/fluid/common/pipes/EnumTankTypes.java (100%) rename {FM/src => src}/dark/fluid/common/pipes/IPipeType.java (100%) rename {FM/src => src}/dark/fluid/common/pipes/ItemBlockPipe.java (100%) rename {FM/src => src}/dark/fluid/common/pipes/ThreadFluidNetwork.java (100%) rename {FM/src => src}/dark/fluid/common/pipes/TileEntityPipe.java (100%) rename {FM/src => src}/dark/fluid/common/pipes/tele/INetworkConnector.java (100%) rename {FM/src => src}/dark/fluid/common/prefab/TileEntityFluidDevice.java (100%) rename {FM/src => src}/dark/fluid/common/prefab/TileEntityFluidNetworkTile.java (100%) rename {FM/src => src}/dark/fluid/common/prefab/TileEntityFluidStorage.java (100%) rename {FM/src => src}/dark/fluid/common/pump/BlockConstructionPump.java (100%) rename {FM/src => src}/dark/fluid/common/pump/BlockDrain.java (100%) rename {FM/src => src}/dark/fluid/common/pump/BlockPumpMachine.java (100%) rename {FM/src => src}/dark/fluid/common/pump/LiquidPathFinder.java (100%) rename {FM/src => src}/dark/fluid/common/pump/TileEntityConstructionPump.java (100%) rename {FM/src => src}/dark/fluid/common/pump/TileEntityDrain.java (100%) rename {FM/src => src}/dark/fluid/common/pump/TileEntityStarterPump.java (100%) rename {FM/src => src}/dark/mech/client/model/ModelGearRod.java (100%) rename {FM/src => src}/dark/mech/client/model/ModelGenerator.java (100%) rename {FM/src => src}/dark/mech/client/render/RenderGearRod.java (100%) rename {FM/src => src}/dark/mech/client/render/RenderGenerator.java (100%) rename {FM/src => src}/dark/mech/common/machines/BlockMechanicalGenerator.java (100%) rename {FM/src => src}/dark/mech/common/machines/BlockRod.java (100%) rename {FM/src => src}/dark/mech/common/machines/BlockSteamPiston.java (100%) rename {FM/src => src}/dark/mech/common/machines/TileEntitySteamPiston.java (100%) rename {FM/tools => tools}/blockSorterTest/README.txt (100%) rename {FM/tools => tools}/blockSorterTest/co/Main.java (100%) diff --git a/FM/.gitattributes b/FM/.gitattributes deleted file mode 100644 index b45edecd..00000000 --- a/FM/.gitattributes +++ /dev/null @@ -1,33 +0,0 @@ -# Auto detect text files and perform LF normalization -* text=auto - -# Custom for Visual Studio -*.cs diff=csharp -*.sln merge=union -*.csproj merge=union -*.vbproj merge=union -*.fsproj merge=union -*.dbproj merge=union - -# Standard to msysgit -*.doc diff=astextplain -*.DOC diff=astextplain -*.docx diff=astextplain -*.DOCX diff=astextplain -*.dot diff=astextplain -*.DOT diff=astextplain -*.pdf diff=astextplain -*.PDF diff=astextplain -*.rtf diff=astextplain -*.RTF diff=astextplain - -# These files are text and should be normalized (Convert crlf => lf) -*.java text -*.xml text -*.txt text - -# These files are binary and should be left untouched -# (binary is a macro for -text -diff) -*.jar binary -*.so binary -*.dll binary diff --git a/FM/.gitignore b/FM/.gitignore deleted file mode 100644 index a1d35d9e..00000000 --- a/FM/.gitignore +++ /dev/null @@ -1 +0,0 @@ -!*.* diff --git a/FM/LICENSE.txt b/FM/LICENSE.txt deleted file mode 100644 index 7ecce872..00000000 --- a/FM/LICENSE.txt +++ /dev/null @@ -1,91 +0,0 @@ -Copyright (c) 2013, DarkGuardsman -All rights reserved. - -0. Definitions - --------------- - -Minecraft: Denotes a copy of the Minecraft game licensed by Mojang AB - -User: Anybody that interacts with the software in one of the following ways: -- play -- decompile -- recompile or compile -- modify -- distribute - -Mod: The mod code designated by the present license, in source form, binary form, as obtained standalone, as part of a wider distribution or resulting from the compilation of the original or modified Minecraft sources. - -Mod Pack - Package distribution of mods and there assets to be used by the user for easy install and collective download. - -Texture Pack - Package distribution of texture or art work to change the visual look of the mod. - -Dependency: Code required for the Mod to work properly. This includes dependencies required to compile the code as well as any file or modification -that is explicatively or implicatively required for the Mod to be working. - -Owner: The project leader of the Mod regardlessly of repo holder, manager, or developer - -1. Scope --------- - -The present license is granted to any user of the Mod. As a prerequisite, a user must own a legally acquired copy of Minecraft. Terms of license may change anytime with or without notice. The user of this Mod will be subject to the newest version of this license. - -2. Liability ------------- - -This Mod is provided 'as is' with no warranties, implied or otherwise. The owner of this Mod takes no responsibility for any damages incurred from the use of this Mod. This Mod alters fundamental parts of the Minecraft game, parts of Minecraft may not work with this Mod installed. All damages caused from the use or misuse of this Mod fall on the user. - -3. Play rights --------------- - -A) The user is allowed to install this Mod on a client and to play without restriction. - -B) Server owners are allowed to install the mod as part of the server as long as the following is meet - 1) Membership to the server is not required to access the content. - -4. Modification rights ----------------------- - -The user may modify the original code for private use, learning experience, or to make a contribution to the original project source code. This does not give the right to redistribute any part of the original or modified code. - -5. Distribution of original or modified copy rights ---------------------------------------------------- - -Is subject to distribution rights this entire Mod in its various forms which -includes but not limited too. -- binaries both original or modified -- source code both original or modified -- patches to its source or binary files -- any copy of a portion of its binaries, or source files - -A) The user is NOT allowed to redistribute this Mod partially, in totality, or included in a distribution without explicate permissions from the owner. With the only exceptions being for the case in section 5 part B. - -B) Distribution of this mod in a mod pack is only allowed if you have permission from the author. Once you have a permission you must agree to the following: - 1) The mod pack should not contain a major version release of the mod within one week of its release to allow for bug fixes. - 2) The mod pack should not contain a modified version of the mod unless to change the texture look of parts of the mod - 3) The mod pack owner or contributors must redirect issues, errors and bug reports to the issue area of the mod's original github repo - 4) The mod pack needs full public permission from all parts of the mod pack including mods, assets, and textures if it is publicly released. - 5) The mod pack or its download site should allow access by users to the list of permissions and credits to authors - 6) The mod pack or its download site should contain links to mod documentation and original mod sites - 7) The mod pack can not make any profit from the distribution of the mod. Including but not limited to adfly links. - 8) Any time any member of the mod's team can revoke the permission without reason - -C)Private mod packs have permission automatically as long as its for a small server. Large server mod packs are considered to be public and need public permission from the author. - -D) Textures of this mod are allowed to be used in the creation or modification of texture packs without permission. That is as long as links and credit to the original mod are given for easy user understanding. - -6. Use in media creations rights ------------------------------------------------------- - -Subject of media includes pictures, films, streams, or any form of graphic based content. -This includes but is not limited to -- You-tube video uploads -- Live streams such as twitch.TV -- Game play videos created by programs like fraps - -A) The user is fully permitted to create media that show content of the mod. However the creator is subject to the following. - 1) The media can not be used to collect profit without permission - 2) The media should not deface the mod in any way. - 3) The media should follow the rules of distribution for the mod - 4) The media should give credit to the mod author - 5) At any time the author can request media to be removed diff --git a/FM/README.md b/FM/README.md deleted file mode 100644 index 229a6b8c..00000000 --- a/FM/README.md +++ /dev/null @@ -1,16 +0,0 @@ -## Fluid Mechanics - -### Brief -Fluid Mechanics is a modifaction for minecraft that uses Forge, and UE to add support for Liquids and Mechanical energy transport and storage. - -### Leaders and Developers -* Darkguardsman - Lead - -### License -This intellectual property is licensed under the following license: https://github.com/DarkGuardsman/Fluid-Mechanics/blob/master/LISENCE.txt - -### Translations -Please submit a pull request if you would be willing to translate this mod into another language. - -### Contact -Join *#universalelectricity* on EsperNet. Remember to follow the rules and respect others as with any other channel. diff --git a/README.md b/README.md index f041fbbc..5d4e8088 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,14 @@ -## FarmTech +## Assembly Line ### Brief -Simple yet open addition to Dark's Core Machine provind advancement and automation in farming - -Based off biotech mod created by LiQuiD +Assembly Line is a Minecraft mod that brings realistic factory style systems into Minecraft. ### Project Team -* Darkguardsman - Lead-Dev -* LiQuiD(liquidgithub) - Dev +* Darkguardsman - Head-Dev +* Archadia - Assistant-Dev +* Briman0094 - Ex-Dev Assembly Line +* Calclavia - Ex-Dev Assembly Line +* LiQuiD - Ex-Dev BioTech ### License @@ -18,4 +19,4 @@ For the full license read the license.txt file inside the repo Please submit a pull request if you would be willing to translate this mod into another language. ### Contact -Join *#universalelectricity* on EsperNet. Remember to follow the rules and respect others as with any other channel. +Join *#universalelectricity* on EsperNet. Remember to follow the rules and respect others as with any other channel. \ No newline at end of file diff --git a/docs/BeltItemFluidFiller.txt b/docs/BeltItemFluidFiller.txt new file mode 100644 index 00000000..c060c827 --- /dev/null +++ b/docs/BeltItemFluidFiller.txt @@ -0,0 +1 @@ +Block that will detect and grab items from belts. Depending on its settings it will fill or drain the item of its fluid volume. \ No newline at end of file diff --git a/FM/docs/BoilerSystemDesign.png b/docs/BoilerSystemDesign.png similarity index 100% rename from FM/docs/BoilerSystemDesign.png rename to docs/BoilerSystemDesign.png diff --git a/FM/docs/HRSG_FLOW-DIAGRAM.jpg b/docs/HRSG_FLOW-DIAGRAM.jpg similarity index 100% rename from FM/docs/HRSG_FLOW-DIAGRAM.jpg rename to docs/HRSG_FLOW-DIAGRAM.jpg diff --git a/FM/docs/Hydroelectric_dam.svg.png b/docs/Hydroelectric_dam.svg.png similarity index 100% rename from FM/docs/Hydroelectric_dam.svg.png rename to docs/Hydroelectric_dam.svg.png diff --git a/FM/docs/Plan.txt b/docs/Plan (2).txt similarity index 100% rename from FM/docs/Plan.txt rename to docs/Plan (2).txt diff --git a/FM/docs/beer-production.jpg b/docs/beer-production.jpg similarity index 100% rename from FM/docs/beer-production.jpg rename to docs/beer-production.jpg diff --git a/FM/docs/steam-boiler-ft-a.gif b/docs/steam-boiler-ft-a.gif similarity index 100% rename from FM/docs/steam-boiler-ft-a.gif rename to docs/steam-boiler-ft-a.gif diff --git a/FM/docs/tanks.txt b/docs/tanks.txt similarity index 100% rename from FM/docs/tanks.txt rename to docs/tanks.txt diff --git a/FM/models/Archive/BOILER TANK.tcn b/models/Archive/BOILER TANK.tcn similarity index 100% rename from FM/models/Archive/BOILER TANK.tcn rename to models/Archive/BOILER TANK.tcn diff --git a/FM/models/Archive/CornerTank.tcn b/models/Archive/CornerTank.tcn similarity index 100% rename from FM/models/Archive/CornerTank.tcn rename to models/Archive/CornerTank.tcn diff --git a/FM/models/Archive/Generator.tcn b/models/Archive/Generator.tcn similarity index 100% rename from FM/models/Archive/Generator.tcn rename to models/Archive/Generator.tcn diff --git a/FM/models/Archive/Pump.tcn b/models/Archive/Pump.tcn similarity index 100% rename from FM/models/Archive/Pump.tcn rename to models/Archive/Pump.tcn diff --git a/FM/models/Archive/STEAM ENGINE.tcn b/models/Archive/STEAM ENGINE.tcn similarity index 100% rename from FM/models/Archive/STEAM ENGINE.tcn rename to models/Archive/STEAM ENGINE.tcn diff --git a/FM/models/Archive/SteamPiston.tcn b/models/Archive/SteamPiston.tcn similarity index 100% rename from FM/models/Archive/SteamPiston.tcn rename to models/Archive/SteamPiston.tcn diff --git a/FM/models/Archive/TankCorner2.tcn b/models/Archive/TankCorner2.tcn similarity index 100% rename from FM/models/Archive/TankCorner2.tcn rename to models/Archive/TankCorner2.tcn diff --git a/FM/models/Archive/TankSingle2.tcn b/models/Archive/TankSingle2.tcn similarity index 100% rename from FM/models/Archive/TankSingle2.tcn rename to models/Archive/TankSingle2.tcn diff --git a/FM/models/Archive/furnace.tcn b/models/Archive/furnace.tcn similarity index 100% rename from FM/models/Archive/furnace.tcn rename to models/Archive/furnace.tcn diff --git a/FM/models/Archive/submittedPipe.tcn b/models/Archive/submittedPipe.tcn similarity index 100% rename from FM/models/Archive/submittedPipe.tcn rename to models/Archive/submittedPipe.tcn diff --git a/FM/models/Current_Models/BasicPump.tcn b/models/Current_Models/BasicPump.tcn similarity index 100% rename from FM/models/Current_Models/BasicPump.tcn rename to models/Current_Models/BasicPump.tcn diff --git a/FM/models/Current_Models/ConstructionPump.tcn b/models/Current_Models/ConstructionPump.tcn similarity index 100% rename from FM/models/Current_Models/ConstructionPump.tcn rename to models/Current_Models/ConstructionPump.tcn diff --git a/FM/models/Current_Models/GearShaft.tcn b/models/Current_Models/GearShaft.tcn similarity index 100% rename from FM/models/Current_Models/GearShaft.tcn rename to models/Current_Models/GearShaft.tcn diff --git a/FM/models/Current_Models/GearShaftPiston.tcn b/models/Current_Models/GearShaftPiston.tcn similarity index 100% rename from FM/models/Current_Models/GearShaftPiston.tcn rename to models/Current_Models/GearShaftPiston.tcn diff --git a/FM/models/Current_Models/Generator.tcn b/models/Current_Models/Generator.tcn similarity index 100% rename from FM/models/Current_Models/Generator.tcn rename to models/Current_Models/Generator.tcn diff --git a/FM/models/Current_Models/HandValve.tcn b/models/Current_Models/HandValve.tcn similarity index 100% rename from FM/models/Current_Models/HandValve.tcn rename to models/Current_Models/HandValve.tcn diff --git a/FM/models/Current_Models/LargePipe.tcn b/models/Current_Models/LargePipe.tcn similarity index 100% rename from FM/models/Current_Models/LargePipe.tcn rename to models/Current_Models/LargePipe.tcn diff --git a/FM/models/Current_Models/MechRod.tcn b/models/Current_Models/MechRod.tcn similarity index 100% rename from FM/models/Current_Models/MechRod.tcn rename to models/Current_Models/MechRod.tcn diff --git a/FM/models/Current_Models/Piston.tcn b/models/Current_Models/Piston.tcn similarity index 100% rename from FM/models/Current_Models/Piston.tcn rename to models/Current_Models/Piston.tcn diff --git a/FM/models/Current_Models/Sink.tcn b/models/Current_Models/Sink.tcn similarity index 100% rename from FM/models/Current_Models/Sink.tcn rename to models/Current_Models/Sink.tcn diff --git a/FM/models/Current_Models/Tank.tcn b/models/Current_Models/Tank.tcn similarity index 100% rename from FM/models/Current_Models/Tank.tcn rename to models/Current_Models/Tank.tcn diff --git a/FM/models/Current_Models/TankSide.java b/models/Current_Models/TankSide.java similarity index 100% rename from FM/models/Current_Models/TankSide.java rename to models/Current_Models/TankSide.java diff --git a/FM/models/Current_Models/TankSide.png b/models/Current_Models/TankSide.png similarity index 100% rename from FM/models/Current_Models/TankSide.png rename to models/Current_Models/TankSide.png diff --git a/FM/models/Current_Models/pipe.tcn b/models/Current_Models/pipe.tcn similarity index 100% rename from FM/models/Current_Models/pipe.tcn rename to models/Current_Models/pipe.tcn diff --git a/FM/models/WIP/Condensor.tcn b/models/WIP/Condensor.tcn similarity index 100% rename from FM/models/WIP/Condensor.tcn rename to models/WIP/Condensor.tcn diff --git a/FM/models/WIP/WindMill.tcn b/models/WIP/WindMill.tcn similarity index 100% rename from FM/models/WIP/WindMill.tcn rename to models/WIP/WindMill.tcn diff --git a/FM/models/WIP/tube.tcn b/models/WIP/tube.tcn similarity index 100% rename from FM/models/WIP/tube.tcn rename to models/WIP/tube.tcn diff --git a/FM/models/rejected/Pump3.tcn b/models/rejected/Pump3.tcn similarity index 100% rename from FM/models/rejected/Pump3.tcn rename to models/rejected/Pump3.tcn diff --git a/FM/models/rejected/PumpV2.tcn b/models/rejected/PumpV2.tcn similarity index 100% rename from FM/models/rejected/PumpV2.tcn rename to models/rejected/PumpV2.tcn diff --git a/FM/models/rejected/something.tcn b/models/rejected/something.tcn similarity index 100% rename from FM/models/rejected/something.tcn rename to models/rejected/something.tcn diff --git a/FM/resources/assets/FM_Banner.png b/resources/assets/FM_Banner.png similarity index 100% rename from FM/resources/assets/FM_Banner.png rename to resources/assets/FM_Banner.png diff --git a/FM/resources/assets/fm/languages/de_DE.properties b/resources/assets/fm/languages/de_DE.properties similarity index 100% rename from FM/resources/assets/fm/languages/de_DE.properties rename to resources/assets/fm/languages/de_DE.properties diff --git a/FM/resources/assets/fm/languages/en_US.properties b/resources/assets/fm/languages/en_US.properties similarity index 100% rename from FM/resources/assets/fm/languages/en_US.properties rename to resources/assets/fm/languages/en_US.properties diff --git a/FM/resources/assets/fm/languages/zh_CN.properties b/resources/assets/fm/languages/zh_CN.properties similarity index 100% rename from FM/resources/assets/fm/languages/zh_CN.properties rename to resources/assets/fm/languages/zh_CN.properties diff --git a/FM/resources/assets/fm/textures/blocks/drain.png b/resources/assets/fm/textures/blocks/drain.png similarity index 100% rename from FM/resources/assets/fm/textures/blocks/drain.png rename to resources/assets/fm/textures/blocks/drain.png diff --git a/FM/resources/assets/fm/textures/blocks/drain2.png b/resources/assets/fm/textures/blocks/drain2.png similarity index 100% rename from FM/resources/assets/fm/textures/blocks/drain2.png rename to resources/assets/fm/textures/blocks/drain2.png diff --git a/FM/resources/assets/fm/textures/blocks/inputMachineSide.png b/resources/assets/fm/textures/blocks/inputMachineSide.png similarity index 100% rename from FM/resources/assets/fm/textures/blocks/inputMachineSide.png rename to resources/assets/fm/textures/blocks/inputMachineSide.png diff --git a/FM/resources/assets/fm/textures/blocks/ironMachineSide.png b/resources/assets/fm/textures/blocks/ironMachineSide.png similarity index 100% rename from FM/resources/assets/fm/textures/blocks/ironMachineSide.png rename to resources/assets/fm/textures/blocks/ironMachineSide.png diff --git a/FM/resources/assets/fm/textures/blocks/iron_block.png b/resources/assets/fm/textures/blocks/iron_block.png similarity index 100% rename from FM/resources/assets/fm/textures/blocks/iron_block.png rename to resources/assets/fm/textures/blocks/iron_block.png diff --git a/FM/resources/assets/fm/textures/blocks/obsidian.png b/resources/assets/fm/textures/blocks/obsidian.png similarity index 100% rename from FM/resources/assets/fm/textures/blocks/obsidian.png rename to resources/assets/fm/textures/blocks/obsidian.png diff --git a/FM/resources/assets/fm/textures/blocks/outputMachineSide.png b/resources/assets/fm/textures/blocks/outputMachineSide.png similarity index 100% rename from FM/resources/assets/fm/textures/blocks/outputMachineSide.png rename to resources/assets/fm/textures/blocks/outputMachineSide.png diff --git a/FM/resources/assets/fm/textures/guis/SteamGUI.png b/resources/assets/fm/textures/guis/SteamGUI.png similarity index 100% rename from FM/resources/assets/fm/textures/guis/SteamGUI.png rename to resources/assets/fm/textures/guis/SteamGUI.png diff --git a/FM/resources/assets/fm/textures/items/GuardKit.png b/resources/assets/fm/textures/items/GuardKit.png similarity index 100% rename from FM/resources/assets/fm/textures/items/GuardKit.png rename to resources/assets/fm/textures/items/GuardKit.png diff --git a/FM/resources/assets/fm/textures/items/items.png b/resources/assets/fm/textures/items/items.png similarity index 100% rename from FM/resources/assets/fm/textures/items/items.png rename to resources/assets/fm/textures/items/items.png diff --git a/FM/resources/assets/fm/textures/models/ConstructionPump.png b/resources/assets/fm/textures/models/ConstructionPump.png similarity index 100% rename from FM/resources/assets/fm/textures/models/ConstructionPump.png rename to resources/assets/fm/textures/models/ConstructionPump.png diff --git a/FM/resources/assets/fm/textures/models/CornerTank.png b/resources/assets/fm/textures/models/CornerTank.png similarity index 100% rename from FM/resources/assets/fm/textures/models/CornerTank.png rename to resources/assets/fm/textures/models/CornerTank.png diff --git a/FM/resources/assets/fm/textures/models/Furnace.png b/resources/assets/fm/textures/models/Furnace.png similarity index 100% rename from FM/resources/assets/fm/textures/models/Furnace.png rename to resources/assets/fm/textures/models/Furnace.png diff --git a/FM/resources/assets/fm/textures/models/GearShaftPiston.png b/resources/assets/fm/textures/models/GearShaftPiston.png similarity index 100% rename from FM/resources/assets/fm/textures/models/GearShaftPiston.png rename to resources/assets/fm/textures/models/GearShaftPiston.png diff --git a/FM/resources/assets/fm/textures/models/ReleaseValve.png b/resources/assets/fm/textures/models/ReleaseValve.png similarity index 100% rename from FM/resources/assets/fm/textures/models/ReleaseValve.png rename to resources/assets/fm/textures/models/ReleaseValve.png diff --git a/FM/resources/assets/fm/textures/models/Sink.png b/resources/assets/fm/textures/models/Sink.png similarity index 100% rename from FM/resources/assets/fm/textures/models/Sink.png rename to resources/assets/fm/textures/models/Sink.png diff --git a/FM/resources/assets/fm/textures/models/TankSide.png b/resources/assets/fm/textures/models/TankSide.png similarity index 100% rename from FM/resources/assets/fm/textures/models/TankSide.png rename to resources/assets/fm/textures/models/TankSide.png diff --git a/FM/resources/assets/fm/textures/models/gear_shaft_piston.png b/resources/assets/fm/textures/models/gear_shaft_piston.png similarity index 100% rename from FM/resources/assets/fm/textures/models/gear_shaft_piston.png rename to resources/assets/fm/textures/models/gear_shaft_piston.png diff --git a/FM/resources/assets/fm/textures/models/mechanical/GearRod.png b/resources/assets/fm/textures/models/mechanical/GearRod.png similarity index 100% rename from FM/resources/assets/fm/textures/models/mechanical/GearRod.png rename to resources/assets/fm/textures/models/mechanical/GearRod.png diff --git a/FM/resources/assets/fm/textures/models/mechanical/Generator.png b/resources/assets/fm/textures/models/mechanical/Generator.png similarity index 100% rename from FM/resources/assets/fm/textures/models/mechanical/Generator.png rename to resources/assets/fm/textures/models/mechanical/Generator.png diff --git a/FM/resources/assets/fm/textures/models/pipes/BlackPipe.png b/resources/assets/fm/textures/models/pipes/BlackPipe.png similarity index 100% rename from FM/resources/assets/fm/textures/models/pipes/BlackPipe.png rename to resources/assets/fm/textures/models/pipes/BlackPipe.png diff --git a/FM/resources/assets/fm/textures/models/pipes/BluePipe.png b/resources/assets/fm/textures/models/pipes/BluePipe.png similarity index 100% rename from FM/resources/assets/fm/textures/models/pipes/BluePipe.png rename to resources/assets/fm/textures/models/pipes/BluePipe.png diff --git a/FM/resources/assets/fm/textures/models/pipes/BrownPipe.png b/resources/assets/fm/textures/models/pipes/BrownPipe.png similarity index 100% rename from FM/resources/assets/fm/textures/models/pipes/BrownPipe.png rename to resources/assets/fm/textures/models/pipes/BrownPipe.png diff --git a/FM/resources/assets/fm/textures/models/pipes/CyanPipe.png b/resources/assets/fm/textures/models/pipes/CyanPipe.png similarity index 100% rename from FM/resources/assets/fm/textures/models/pipes/CyanPipe.png rename to resources/assets/fm/textures/models/pipes/CyanPipe.png diff --git a/FM/resources/assets/fm/textures/models/pipes/GreenPipe.png b/resources/assets/fm/textures/models/pipes/GreenPipe.png similarity index 100% rename from FM/resources/assets/fm/textures/models/pipes/GreenPipe.png rename to resources/assets/fm/textures/models/pipes/GreenPipe.png diff --git a/FM/resources/assets/fm/textures/models/pipes/GreyPipe.png b/resources/assets/fm/textures/models/pipes/GreyPipe.png similarity index 100% rename from FM/resources/assets/fm/textures/models/pipes/GreyPipe.png rename to resources/assets/fm/textures/models/pipes/GreyPipe.png diff --git a/FM/resources/assets/fm/textures/models/pipes/LavaPipe.png b/resources/assets/fm/textures/models/pipes/LavaPipe.png similarity index 100% rename from FM/resources/assets/fm/textures/models/pipes/LavaPipe.png rename to resources/assets/fm/textures/models/pipes/LavaPipe.png diff --git a/FM/resources/assets/fm/textures/models/pipes/LightBluePipe.png b/resources/assets/fm/textures/models/pipes/LightBluePipe.png similarity index 100% rename from FM/resources/assets/fm/textures/models/pipes/LightBluePipe.png rename to resources/assets/fm/textures/models/pipes/LightBluePipe.png diff --git a/FM/resources/assets/fm/textures/models/pipes/LimePipe.png b/resources/assets/fm/textures/models/pipes/LimePipe.png similarity index 100% rename from FM/resources/assets/fm/textures/models/pipes/LimePipe.png rename to resources/assets/fm/textures/models/pipes/LimePipe.png diff --git a/FM/resources/assets/fm/textures/models/pipes/MagentaPipe.png b/resources/assets/fm/textures/models/pipes/MagentaPipe.png similarity index 100% rename from FM/resources/assets/fm/textures/models/pipes/MagentaPipe.png rename to resources/assets/fm/textures/models/pipes/MagentaPipe.png diff --git a/FM/resources/assets/fm/textures/models/pipes/OrangePipe.png b/resources/assets/fm/textures/models/pipes/OrangePipe.png similarity index 100% rename from FM/resources/assets/fm/textures/models/pipes/OrangePipe.png rename to resources/assets/fm/textures/models/pipes/OrangePipe.png diff --git a/FM/resources/assets/fm/textures/models/pipes/PinkPipe.png b/resources/assets/fm/textures/models/pipes/PinkPipe.png similarity index 100% rename from FM/resources/assets/fm/textures/models/pipes/PinkPipe.png rename to resources/assets/fm/textures/models/pipes/PinkPipe.png diff --git a/FM/resources/assets/fm/textures/models/pipes/Pipe.png b/resources/assets/fm/textures/models/pipes/Pipe.png similarity index 100% rename from FM/resources/assets/fm/textures/models/pipes/Pipe.png rename to resources/assets/fm/textures/models/pipes/Pipe.png diff --git a/FM/resources/assets/fm/textures/models/pipes/PurplePipe.png b/resources/assets/fm/textures/models/pipes/PurplePipe.png similarity index 100% rename from FM/resources/assets/fm/textures/models/pipes/PurplePipe.png rename to resources/assets/fm/textures/models/pipes/PurplePipe.png diff --git a/FM/resources/assets/fm/textures/models/pipes/RedPipe.png b/resources/assets/fm/textures/models/pipes/RedPipe.png similarity index 100% rename from FM/resources/assets/fm/textures/models/pipes/RedPipe.png rename to resources/assets/fm/textures/models/pipes/RedPipe.png diff --git a/FM/resources/assets/fm/textures/models/pipes/SilverPipe.png b/resources/assets/fm/textures/models/pipes/SilverPipe.png similarity index 100% rename from FM/resources/assets/fm/textures/models/pipes/SilverPipe.png rename to resources/assets/fm/textures/models/pipes/SilverPipe.png diff --git a/FM/resources/assets/fm/textures/models/pipes/WhitePipe.png b/resources/assets/fm/textures/models/pipes/WhitePipe.png similarity index 100% rename from FM/resources/assets/fm/textures/models/pipes/WhitePipe.png rename to resources/assets/fm/textures/models/pipes/WhitePipe.png diff --git a/FM/resources/assets/fm/textures/models/pipes/YellowPipe.png b/resources/assets/fm/textures/models/pipes/YellowPipe.png similarity index 100% rename from FM/resources/assets/fm/textures/models/pipes/YellowPipe.png rename to resources/assets/fm/textures/models/pipes/YellowPipe.png diff --git a/FM/resources/assets/fm/textures/models/pipes/bronze/Pipe.png b/resources/assets/fm/textures/models/pipes/bronze/Pipe.png similarity index 100% rename from FM/resources/assets/fm/textures/models/pipes/bronze/Pipe.png rename to resources/assets/fm/textures/models/pipes/bronze/Pipe.png diff --git a/FM/resources/assets/fm/textures/models/pipes/copper/Pipe.png b/resources/assets/fm/textures/models/pipes/copper/Pipe.png similarity index 100% rename from FM/resources/assets/fm/textures/models/pipes/copper/Pipe.png rename to resources/assets/fm/textures/models/pipes/copper/Pipe.png diff --git a/FM/resources/assets/fm/textures/models/pipes/glass/Pipe.png b/resources/assets/fm/textures/models/pipes/glass/Pipe.png similarity index 100% rename from FM/resources/assets/fm/textures/models/pipes/glass/Pipe.png rename to resources/assets/fm/textures/models/pipes/glass/Pipe.png diff --git a/FM/resources/assets/fm/textures/models/pipes/gold/Pipe.png b/resources/assets/fm/textures/models/pipes/gold/Pipe.png similarity index 100% rename from FM/resources/assets/fm/textures/models/pipes/gold/Pipe.png rename to resources/assets/fm/textures/models/pipes/gold/Pipe.png diff --git a/FM/resources/assets/fm/textures/models/pipes/hell/Pipe.png b/resources/assets/fm/textures/models/pipes/hell/Pipe.png similarity index 100% rename from FM/resources/assets/fm/textures/models/pipes/hell/Pipe.png rename to resources/assets/fm/textures/models/pipes/hell/Pipe.png diff --git a/FM/resources/assets/fm/textures/models/pipes/iron/Pipe.png b/resources/assets/fm/textures/models/pipes/iron/Pipe.png similarity index 100% rename from FM/resources/assets/fm/textures/models/pipes/iron/Pipe.png rename to resources/assets/fm/textures/models/pipes/iron/Pipe.png diff --git a/FM/resources/assets/fm/textures/models/pipes/obby/Pipe.png b/resources/assets/fm/textures/models/pipes/obby/Pipe.png similarity index 100% rename from FM/resources/assets/fm/textures/models/pipes/obby/Pipe.png rename to resources/assets/fm/textures/models/pipes/obby/Pipe.png diff --git a/FM/resources/assets/fm/textures/models/pipes/steel/Pipe.png b/resources/assets/fm/textures/models/pipes/steel/Pipe.png similarity index 100% rename from FM/resources/assets/fm/textures/models/pipes/steel/Pipe.png rename to resources/assets/fm/textures/models/pipes/steel/Pipe.png diff --git a/FM/resources/assets/fm/textures/models/pipes/stone/Pipe.png b/resources/assets/fm/textures/models/pipes/stone/Pipe.png similarity index 100% rename from FM/resources/assets/fm/textures/models/pipes/stone/Pipe.png rename to resources/assets/fm/textures/models/pipes/stone/Pipe.png diff --git a/FM/resources/assets/fm/textures/models/pipes/tin/Pipe.png b/resources/assets/fm/textures/models/pipes/tin/Pipe.png similarity index 100% rename from FM/resources/assets/fm/textures/models/pipes/tin/Pipe.png rename to resources/assets/fm/textures/models/pipes/tin/Pipe.png diff --git a/FM/resources/assets/fm/textures/models/pipes/wood/Pipe.png b/resources/assets/fm/textures/models/pipes/wood/Pipe.png similarity index 100% rename from FM/resources/assets/fm/textures/models/pipes/wood/Pipe.png rename to resources/assets/fm/textures/models/pipes/wood/Pipe.png diff --git a/FM/resources/assets/fm/textures/models/pumps/WaterPump.png b/resources/assets/fm/textures/models/pumps/WaterPump.png similarity index 100% rename from FM/resources/assets/fm/textures/models/pumps/WaterPump.png rename to resources/assets/fm/textures/models/pumps/WaterPump.png diff --git a/FM/resources/assets/fm/textures/models/tankBlock.png b/resources/assets/fm/textures/models/tankBlock.png similarity index 100% rename from FM/resources/assets/fm/textures/models/tankBlock.png rename to resources/assets/fm/textures/models/tankBlock.png diff --git a/FM/resources/assets/fm/textures/models/tankTexture.png b/resources/assets/fm/textures/models/tankTexture.png similarity index 100% rename from FM/resources/assets/fm/textures/models/tankTexture.png rename to resources/assets/fm/textures/models/tankTexture.png diff --git a/FM/src/dark/api/fluid/IDrain.java b/src/dark/api/fluid/IDrain.java similarity index 100% rename from FM/src/dark/api/fluid/IDrain.java rename to src/dark/api/fluid/IDrain.java diff --git a/FM/src/dark/api/fluid/INetworkFluidPart.java b/src/dark/api/fluid/INetworkFluidPart.java similarity index 100% rename from FM/src/dark/api/fluid/INetworkFluidPart.java rename to src/dark/api/fluid/INetworkFluidPart.java diff --git a/FM/src/dark/api/fluid/INetworkPipe.java b/src/dark/api/fluid/INetworkPipe.java similarity index 100% rename from FM/src/dark/api/fluid/INetworkPipe.java rename to src/dark/api/fluid/INetworkPipe.java diff --git a/FM/src/dark/core/prefab/tilenetwork/fluid/FluidCraftingHandler.java b/src/dark/core/prefab/tilenetwork/fluid/FluidCraftingHandler.java similarity index 100% rename from FM/src/dark/core/prefab/tilenetwork/fluid/FluidCraftingHandler.java rename to src/dark/core/prefab/tilenetwork/fluid/FluidCraftingHandler.java diff --git a/FM/src/dark/core/prefab/tilenetwork/fluid/FluidPressurePack.java b/src/dark/core/prefab/tilenetwork/fluid/FluidPressurePack.java similarity index 100% rename from FM/src/dark/core/prefab/tilenetwork/fluid/FluidPressurePack.java rename to src/dark/core/prefab/tilenetwork/fluid/FluidPressurePack.java diff --git a/FM/src/dark/core/prefab/tilenetwork/fluid/FluidRecipeInfo.java b/src/dark/core/prefab/tilenetwork/fluid/FluidRecipeInfo.java similarity index 100% rename from FM/src/dark/core/prefab/tilenetwork/fluid/FluidRecipeInfo.java rename to src/dark/core/prefab/tilenetwork/fluid/FluidRecipeInfo.java diff --git a/FM/src/dark/core/prefab/tilenetwork/fluid/IFluidRecipeCrafter.java b/src/dark/core/prefab/tilenetwork/fluid/IFluidRecipeCrafter.java similarity index 100% rename from FM/src/dark/core/prefab/tilenetwork/fluid/IFluidRecipeCrafter.java rename to src/dark/core/prefab/tilenetwork/fluid/IFluidRecipeCrafter.java diff --git a/FM/src/dark/core/prefab/tilenetwork/fluid/NetworkFluidContainers.java b/src/dark/core/prefab/tilenetwork/fluid/NetworkFluidContainers.java similarity index 100% rename from FM/src/dark/core/prefab/tilenetwork/fluid/NetworkFluidContainers.java rename to src/dark/core/prefab/tilenetwork/fluid/NetworkFluidContainers.java diff --git a/FM/src/dark/core/prefab/tilenetwork/fluid/NetworkFluidTiles.java b/src/dark/core/prefab/tilenetwork/fluid/NetworkFluidTiles.java similarity index 100% rename from FM/src/dark/core/prefab/tilenetwork/fluid/NetworkFluidTiles.java rename to src/dark/core/prefab/tilenetwork/fluid/NetworkFluidTiles.java diff --git a/FM/src/dark/core/prefab/tilenetwork/fluid/NetworkPipes.java b/src/dark/core/prefab/tilenetwork/fluid/NetworkPipes.java similarity index 100% rename from FM/src/dark/core/prefab/tilenetwork/fluid/NetworkPipes.java rename to src/dark/core/prefab/tilenetwork/fluid/NetworkPipes.java diff --git a/FM/src/dark/fluid/client/ClientProxy.java b/src/dark/fluid/client/ClientProxy.java similarity index 100% rename from FM/src/dark/fluid/client/ClientProxy.java rename to src/dark/fluid/client/ClientProxy.java diff --git a/FM/src/dark/fluid/client/model/ModelCenterTank.java b/src/dark/fluid/client/model/ModelCenterTank.java similarity index 100% rename from FM/src/dark/fluid/client/model/ModelCenterTank.java rename to src/dark/fluid/client/model/ModelCenterTank.java diff --git a/FM/src/dark/fluid/client/model/ModelConstructionPump.java b/src/dark/fluid/client/model/ModelConstructionPump.java similarity index 100% rename from FM/src/dark/fluid/client/model/ModelConstructionPump.java rename to src/dark/fluid/client/model/ModelConstructionPump.java diff --git a/FM/src/dark/fluid/client/model/ModelCornerTank.java b/src/dark/fluid/client/model/ModelCornerTank.java similarity index 100% rename from FM/src/dark/fluid/client/model/ModelCornerTank.java rename to src/dark/fluid/client/model/ModelCornerTank.java diff --git a/FM/src/dark/fluid/client/model/ModelEngine.java b/src/dark/fluid/client/model/ModelEngine.java similarity index 100% rename from FM/src/dark/fluid/client/model/ModelEngine.java rename to src/dark/fluid/client/model/ModelEngine.java diff --git a/FM/src/dark/fluid/client/model/ModelFurnace.java b/src/dark/fluid/client/model/ModelFurnace.java similarity index 100% rename from FM/src/dark/fluid/client/model/ModelFurnace.java rename to src/dark/fluid/client/model/ModelFurnace.java diff --git a/FM/src/dark/fluid/client/model/ModelGearPiston.java b/src/dark/fluid/client/model/ModelGearPiston.java similarity index 100% rename from FM/src/dark/fluid/client/model/ModelGearPiston.java rename to src/dark/fluid/client/model/ModelGearPiston.java diff --git a/FM/src/dark/fluid/client/model/ModelGenerator.java b/src/dark/fluid/client/model/ModelGenerator.java similarity index 100% rename from FM/src/dark/fluid/client/model/ModelGenerator.java rename to src/dark/fluid/client/model/ModelGenerator.java diff --git a/FM/src/dark/fluid/client/model/ModelLargePipe.java b/src/dark/fluid/client/model/ModelLargePipe.java similarity index 100% rename from FM/src/dark/fluid/client/model/ModelLargePipe.java rename to src/dark/fluid/client/model/ModelLargePipe.java diff --git a/FM/src/dark/fluid/client/model/ModelLiquidTankCorner.java b/src/dark/fluid/client/model/ModelLiquidTankCorner.java similarity index 100% rename from FM/src/dark/fluid/client/model/ModelLiquidTankCorner.java rename to src/dark/fluid/client/model/ModelLiquidTankCorner.java diff --git a/FM/src/dark/fluid/client/model/ModelPump.java b/src/dark/fluid/client/model/ModelPump.java similarity index 100% rename from FM/src/dark/fluid/client/model/ModelPump.java rename to src/dark/fluid/client/model/ModelPump.java diff --git a/FM/src/dark/fluid/client/model/ModelReleaseValve.java b/src/dark/fluid/client/model/ModelReleaseValve.java similarity index 100% rename from FM/src/dark/fluid/client/model/ModelReleaseValve.java rename to src/dark/fluid/client/model/ModelReleaseValve.java diff --git a/FM/src/dark/fluid/client/model/ModelSink.java b/src/dark/fluid/client/model/ModelSink.java similarity index 100% rename from FM/src/dark/fluid/client/model/ModelSink.java rename to src/dark/fluid/client/model/ModelSink.java diff --git a/FM/src/dark/fluid/client/model/ModelTank.java b/src/dark/fluid/client/model/ModelTank.java similarity index 100% rename from FM/src/dark/fluid/client/model/ModelTank.java rename to src/dark/fluid/client/model/ModelTank.java diff --git a/FM/src/dark/fluid/client/model/ModelTankSide.java b/src/dark/fluid/client/model/ModelTankSide.java similarity index 100% rename from FM/src/dark/fluid/client/model/ModelTankSide.java rename to src/dark/fluid/client/model/ModelTankSide.java diff --git a/FM/src/dark/fluid/client/render/BlockRenderHelper.java b/src/dark/fluid/client/render/BlockRenderHelper.java similarity index 100% rename from FM/src/dark/fluid/client/render/BlockRenderHelper.java rename to src/dark/fluid/client/render/BlockRenderHelper.java diff --git a/FM/src/dark/fluid/client/render/ItemPipeRenderer.java b/src/dark/fluid/client/render/ItemPipeRenderer.java similarity index 100% rename from FM/src/dark/fluid/client/render/ItemPipeRenderer.java rename to src/dark/fluid/client/render/ItemPipeRenderer.java diff --git a/FM/src/dark/fluid/client/render/ItemTankRenderer.java b/src/dark/fluid/client/render/ItemTankRenderer.java similarity index 100% rename from FM/src/dark/fluid/client/render/ItemTankRenderer.java rename to src/dark/fluid/client/render/ItemTankRenderer.java diff --git a/FM/src/dark/fluid/client/render/RenderConstructionPump.java b/src/dark/fluid/client/render/RenderConstructionPump.java similarity index 100% rename from FM/src/dark/fluid/client/render/RenderConstructionPump.java rename to src/dark/fluid/client/render/RenderConstructionPump.java diff --git a/FM/src/dark/fluid/client/render/RenderFurnace.java b/src/dark/fluid/client/render/RenderFurnace.java similarity index 100% rename from FM/src/dark/fluid/client/render/RenderFurnace.java rename to src/dark/fluid/client/render/RenderFurnace.java diff --git a/FM/src/dark/fluid/client/render/RenderGearPiston.java b/src/dark/fluid/client/render/RenderGearPiston.java similarity index 100% rename from FM/src/dark/fluid/client/render/RenderGearPiston.java rename to src/dark/fluid/client/render/RenderGearPiston.java diff --git a/FM/src/dark/fluid/client/render/RenderPipe.java b/src/dark/fluid/client/render/RenderPipe.java similarity index 100% rename from FM/src/dark/fluid/client/render/RenderPipe.java rename to src/dark/fluid/client/render/RenderPipe.java diff --git a/FM/src/dark/fluid/client/render/RenderPump.java b/src/dark/fluid/client/render/RenderPump.java similarity index 100% rename from FM/src/dark/fluid/client/render/RenderPump.java rename to src/dark/fluid/client/render/RenderPump.java diff --git a/FM/src/dark/fluid/client/render/RenderReleaseValve.java b/src/dark/fluid/client/render/RenderReleaseValve.java similarity index 100% rename from FM/src/dark/fluid/client/render/RenderReleaseValve.java rename to src/dark/fluid/client/render/RenderReleaseValve.java diff --git a/FM/src/dark/fluid/client/render/RenderSink.java b/src/dark/fluid/client/render/RenderSink.java similarity index 100% rename from FM/src/dark/fluid/client/render/RenderSink.java rename to src/dark/fluid/client/render/RenderSink.java diff --git a/FM/src/dark/fluid/client/render/RenderTank.java b/src/dark/fluid/client/render/RenderTank.java similarity index 100% rename from FM/src/dark/fluid/client/render/RenderTank.java rename to src/dark/fluid/client/render/RenderTank.java diff --git a/FM/src/dark/fluid/common/CommonProxy.java b/src/dark/fluid/common/CommonProxy.java similarity index 100% rename from FM/src/dark/fluid/common/CommonProxy.java rename to src/dark/fluid/common/CommonProxy.java diff --git a/FM/src/dark/fluid/common/FMRecipeLoader.java b/src/dark/fluid/common/FMRecipeLoader.java similarity index 100% rename from FM/src/dark/fluid/common/FMRecipeLoader.java rename to src/dark/fluid/common/FMRecipeLoader.java diff --git a/FM/src/dark/fluid/common/FluidMech.java b/src/dark/fluid/common/FluidMech.java similarity index 100% rename from FM/src/dark/fluid/common/FluidMech.java rename to src/dark/fluid/common/FluidMech.java diff --git a/FM/src/dark/fluid/common/FluidPartsMaterial.java b/src/dark/fluid/common/FluidPartsMaterial.java similarity index 100% rename from FM/src/dark/fluid/common/FluidPartsMaterial.java rename to src/dark/fluid/common/FluidPartsMaterial.java diff --git a/FM/src/dark/fluid/common/machines/BlockFM.java b/src/dark/fluid/common/machines/BlockFM.java similarity index 100% rename from FM/src/dark/fluid/common/machines/BlockFM.java rename to src/dark/fluid/common/machines/BlockFM.java diff --git a/FM/src/dark/fluid/common/machines/BlockReleaseValve.java b/src/dark/fluid/common/machines/BlockReleaseValve.java similarity index 100% rename from FM/src/dark/fluid/common/machines/BlockReleaseValve.java rename to src/dark/fluid/common/machines/BlockReleaseValve.java diff --git a/FM/src/dark/fluid/common/machines/BlockSink.java b/src/dark/fluid/common/machines/BlockSink.java similarity index 100% rename from FM/src/dark/fluid/common/machines/BlockSink.java rename to src/dark/fluid/common/machines/BlockSink.java diff --git a/FM/src/dark/fluid/common/machines/BlockTank.java b/src/dark/fluid/common/machines/BlockTank.java similarity index 100% rename from FM/src/dark/fluid/common/machines/BlockTank.java rename to src/dark/fluid/common/machines/BlockTank.java diff --git a/FM/src/dark/fluid/common/machines/TileEntityReleaseValve.java b/src/dark/fluid/common/machines/TileEntityReleaseValve.java similarity index 100% rename from FM/src/dark/fluid/common/machines/TileEntityReleaseValve.java rename to src/dark/fluid/common/machines/TileEntityReleaseValve.java diff --git a/FM/src/dark/fluid/common/machines/TileEntitySink.java b/src/dark/fluid/common/machines/TileEntitySink.java similarity index 100% rename from FM/src/dark/fluid/common/machines/TileEntitySink.java rename to src/dark/fluid/common/machines/TileEntitySink.java diff --git a/FM/src/dark/fluid/common/machines/TileEntityTank.java b/src/dark/fluid/common/machines/TileEntityTank.java similarity index 100% rename from FM/src/dark/fluid/common/machines/TileEntityTank.java rename to src/dark/fluid/common/machines/TileEntityTank.java diff --git a/FM/src/dark/fluid/common/pipes/BlockPipe.java b/src/dark/fluid/common/pipes/BlockPipe.java similarity index 100% rename from FM/src/dark/fluid/common/pipes/BlockPipe.java rename to src/dark/fluid/common/pipes/BlockPipe.java diff --git a/FM/src/dark/fluid/common/pipes/EnumPipeType.java b/src/dark/fluid/common/pipes/EnumPipeType.java similarity index 100% rename from FM/src/dark/fluid/common/pipes/EnumPipeType.java rename to src/dark/fluid/common/pipes/EnumPipeType.java diff --git a/FM/src/dark/fluid/common/pipes/EnumTankTypes.java b/src/dark/fluid/common/pipes/EnumTankTypes.java similarity index 100% rename from FM/src/dark/fluid/common/pipes/EnumTankTypes.java rename to src/dark/fluid/common/pipes/EnumTankTypes.java diff --git a/FM/src/dark/fluid/common/pipes/IPipeType.java b/src/dark/fluid/common/pipes/IPipeType.java similarity index 100% rename from FM/src/dark/fluid/common/pipes/IPipeType.java rename to src/dark/fluid/common/pipes/IPipeType.java diff --git a/FM/src/dark/fluid/common/pipes/ItemBlockPipe.java b/src/dark/fluid/common/pipes/ItemBlockPipe.java similarity index 100% rename from FM/src/dark/fluid/common/pipes/ItemBlockPipe.java rename to src/dark/fluid/common/pipes/ItemBlockPipe.java diff --git a/FM/src/dark/fluid/common/pipes/ThreadFluidNetwork.java b/src/dark/fluid/common/pipes/ThreadFluidNetwork.java similarity index 100% rename from FM/src/dark/fluid/common/pipes/ThreadFluidNetwork.java rename to src/dark/fluid/common/pipes/ThreadFluidNetwork.java diff --git a/FM/src/dark/fluid/common/pipes/TileEntityPipe.java b/src/dark/fluid/common/pipes/TileEntityPipe.java similarity index 100% rename from FM/src/dark/fluid/common/pipes/TileEntityPipe.java rename to src/dark/fluid/common/pipes/TileEntityPipe.java diff --git a/FM/src/dark/fluid/common/pipes/tele/INetworkConnector.java b/src/dark/fluid/common/pipes/tele/INetworkConnector.java similarity index 100% rename from FM/src/dark/fluid/common/pipes/tele/INetworkConnector.java rename to src/dark/fluid/common/pipes/tele/INetworkConnector.java diff --git a/FM/src/dark/fluid/common/prefab/TileEntityFluidDevice.java b/src/dark/fluid/common/prefab/TileEntityFluidDevice.java similarity index 100% rename from FM/src/dark/fluid/common/prefab/TileEntityFluidDevice.java rename to src/dark/fluid/common/prefab/TileEntityFluidDevice.java diff --git a/FM/src/dark/fluid/common/prefab/TileEntityFluidNetworkTile.java b/src/dark/fluid/common/prefab/TileEntityFluidNetworkTile.java similarity index 100% rename from FM/src/dark/fluid/common/prefab/TileEntityFluidNetworkTile.java rename to src/dark/fluid/common/prefab/TileEntityFluidNetworkTile.java diff --git a/FM/src/dark/fluid/common/prefab/TileEntityFluidStorage.java b/src/dark/fluid/common/prefab/TileEntityFluidStorage.java similarity index 100% rename from FM/src/dark/fluid/common/prefab/TileEntityFluidStorage.java rename to src/dark/fluid/common/prefab/TileEntityFluidStorage.java diff --git a/FM/src/dark/fluid/common/pump/BlockConstructionPump.java b/src/dark/fluid/common/pump/BlockConstructionPump.java similarity index 100% rename from FM/src/dark/fluid/common/pump/BlockConstructionPump.java rename to src/dark/fluid/common/pump/BlockConstructionPump.java diff --git a/FM/src/dark/fluid/common/pump/BlockDrain.java b/src/dark/fluid/common/pump/BlockDrain.java similarity index 100% rename from FM/src/dark/fluid/common/pump/BlockDrain.java rename to src/dark/fluid/common/pump/BlockDrain.java diff --git a/FM/src/dark/fluid/common/pump/BlockPumpMachine.java b/src/dark/fluid/common/pump/BlockPumpMachine.java similarity index 100% rename from FM/src/dark/fluid/common/pump/BlockPumpMachine.java rename to src/dark/fluid/common/pump/BlockPumpMachine.java diff --git a/FM/src/dark/fluid/common/pump/LiquidPathFinder.java b/src/dark/fluid/common/pump/LiquidPathFinder.java similarity index 100% rename from FM/src/dark/fluid/common/pump/LiquidPathFinder.java rename to src/dark/fluid/common/pump/LiquidPathFinder.java diff --git a/FM/src/dark/fluid/common/pump/TileEntityConstructionPump.java b/src/dark/fluid/common/pump/TileEntityConstructionPump.java similarity index 100% rename from FM/src/dark/fluid/common/pump/TileEntityConstructionPump.java rename to src/dark/fluid/common/pump/TileEntityConstructionPump.java diff --git a/FM/src/dark/fluid/common/pump/TileEntityDrain.java b/src/dark/fluid/common/pump/TileEntityDrain.java similarity index 100% rename from FM/src/dark/fluid/common/pump/TileEntityDrain.java rename to src/dark/fluid/common/pump/TileEntityDrain.java diff --git a/FM/src/dark/fluid/common/pump/TileEntityStarterPump.java b/src/dark/fluid/common/pump/TileEntityStarterPump.java similarity index 100% rename from FM/src/dark/fluid/common/pump/TileEntityStarterPump.java rename to src/dark/fluid/common/pump/TileEntityStarterPump.java diff --git a/FM/src/dark/mech/client/model/ModelGearRod.java b/src/dark/mech/client/model/ModelGearRod.java similarity index 100% rename from FM/src/dark/mech/client/model/ModelGearRod.java rename to src/dark/mech/client/model/ModelGearRod.java diff --git a/FM/src/dark/mech/client/model/ModelGenerator.java b/src/dark/mech/client/model/ModelGenerator.java similarity index 100% rename from FM/src/dark/mech/client/model/ModelGenerator.java rename to src/dark/mech/client/model/ModelGenerator.java diff --git a/FM/src/dark/mech/client/render/RenderGearRod.java b/src/dark/mech/client/render/RenderGearRod.java similarity index 100% rename from FM/src/dark/mech/client/render/RenderGearRod.java rename to src/dark/mech/client/render/RenderGearRod.java diff --git a/FM/src/dark/mech/client/render/RenderGenerator.java b/src/dark/mech/client/render/RenderGenerator.java similarity index 100% rename from FM/src/dark/mech/client/render/RenderGenerator.java rename to src/dark/mech/client/render/RenderGenerator.java diff --git a/FM/src/dark/mech/common/machines/BlockMechanicalGenerator.java b/src/dark/mech/common/machines/BlockMechanicalGenerator.java similarity index 100% rename from FM/src/dark/mech/common/machines/BlockMechanicalGenerator.java rename to src/dark/mech/common/machines/BlockMechanicalGenerator.java diff --git a/FM/src/dark/mech/common/machines/BlockRod.java b/src/dark/mech/common/machines/BlockRod.java similarity index 100% rename from FM/src/dark/mech/common/machines/BlockRod.java rename to src/dark/mech/common/machines/BlockRod.java diff --git a/FM/src/dark/mech/common/machines/BlockSteamPiston.java b/src/dark/mech/common/machines/BlockSteamPiston.java similarity index 100% rename from FM/src/dark/mech/common/machines/BlockSteamPiston.java rename to src/dark/mech/common/machines/BlockSteamPiston.java diff --git a/FM/src/dark/mech/common/machines/TileEntitySteamPiston.java b/src/dark/mech/common/machines/TileEntitySteamPiston.java similarity index 100% rename from FM/src/dark/mech/common/machines/TileEntitySteamPiston.java rename to src/dark/mech/common/machines/TileEntitySteamPiston.java diff --git a/FM/tools/blockSorterTest/README.txt b/tools/blockSorterTest/README.txt similarity index 100% rename from FM/tools/blockSorterTest/README.txt rename to tools/blockSorterTest/README.txt diff --git a/FM/tools/blockSorterTest/co/Main.java b/tools/blockSorterTest/co/Main.java similarity index 100% rename from FM/tools/blockSorterTest/co/Main.java rename to tools/blockSorterTest/co/Main.java