MineFluence Git changeshttps://ci.codecrafter47.de/view/all/job/MineFluence/changesMineFluence Git changes#32 use newer forge version (flo.e3)https://ci.codecrafter47.de/view/all/job/MineFluence/32/changes#detail0view/all/job/MineFluence/32/changes#detail0Thu, 11 Jun 2015 21:19:43 +0200jenkins@server4.codecrafter47.debuild.gradle #31 split machine blocks into separate blocks (flo.e3)https://ci.codecrafter47.de/view/all/job/MineFluence/31/changes#detail0view/all/job/MineFluence/31/changes#detail0Sat, 28 Mar 2015 16:32:51 +0100jenkins@server4.codecrafter47.desrc/main/java/net/ocine/minefluence/models/ModelMachineBlockBorder.java src/main/resources/assets/minefluence/models/item/machineBlockCooler.watercooling.json src/main/resources/assets/minefluence/models/block/machineBlocks_output.json src/main/resources/assets/minefluence/blockstates/machineBlockWorker.json src/main/java/net/ocine/minefluence/blocks/MachineBlockInput.java src/main/resources/assets/minefluence/models/item/machineBlockDisplay.json src/main/java/net/ocine/minefluence/blocks/MachineBlockDisplay.java src/main/resources/assets/minefluence/models/item/machineBlockCore.json src/main/java/net/ocine/minefluence/blocks/tileentities/TileEntityDisplay.java src/main/java/net/ocine/minefluence/blocks/MachineBlockOutput.java src/main/resources/assets/minefluence/models/block/machineBlocks_input.json src/main/java/net/ocine/minefluence/blocks/tileentities/TileEntityCooler.java src/main/resources/assets/minefluence/blockstates/machineBlockCooler.json src/main/resources/assets/minefluence/lang/en_US.lang src/main/resources/assets/minefluence/models/item/machineBlocks_output.json src/main/resources/assets/minefluence/models/item/machineBlockCooler.fan.json src/main/resources/assets/minefluence/models/block/machineBlocks_fan.json src/main/resources/assets/minefluence/models/item/machineBlockWorker.worker.json src/main/java/net/ocine/minefluence/blocks/MachineBlockCooler.java src/main/java/net/ocine/minefluence/blocks/tileentities/IMachinePart.java src/main/java/net/ocine/minefluence/blocks/MachineBlockWorker.java src/main/resources/assets/minefluence/models/block/machineBlockInput.json src/main/resources/assets/minefluence/models/item/machineBlockWorker.hyperworker.json src/main/java/net/ocine/minefluence/blocks/tileentities/TileEntityWorker.java src/main/resources/assets/minefluence/models/item/machineBlocks_display.json src/main/resources/assets/minefluence/models/item/machineBlocks_input.json src/main/java/net/ocine/minefluence/blocks/MachineBlockWorkerItem.java src/main/java/net/ocine/minefluence/blocks/Blocks.java src/main/resources/assets/minefluence/models/item/machineBlocks.json src/main/resources/assets/minefluence/models/block/machineBlockDisplay.json src/main/resources/assets/minefluence/models/block/machineBlockOutput.json src/main/resources/assets/minefluence/models/item/machineBlockInput.json src/main/java/net/ocine/minefluence/blocks/tileentities/TileEntityHyperworker.java src/main/resources/assets/minefluence/models/item/machineBlocks_fan.json src/main/resources/assets/minefluence/lang/de_DE.lang src/main/resources/assets/minefluence/models/item/machineBlocks_watercooling.json src/main/java/net/ocine/minefluence/blocks/MachineBlocks.java src/main/resources/assets/minefluence/models/block/machineBlockCooler.watercooling.json src/main/java/net/ocine/minefluence/blocks/MachineBlocksItemBlock.java src/main/resources/assets/minefluence/models/item/machineBlockOutput.json src/main/java/net/ocine/minefluence/proxys/ClientProxy.java src/main/resources/assets/minefluence/blockstates/machineBlockDisplay.json src/main/resources/assets/minefluence/blockstates/machineBlockOutput.json src/main/java/net/ocine/minefluence/blocks/MachineBlockCoolerItem.java src/main/resources/assets/minefluence/models/block/machineBlocks.json src/main/java/net/ocine/minefluence/blocks/tileentities/TileEntityOutput.java src/main/java/net/ocine/minefluence/blocks/tileentities/TileEntityInput.java src/main/resources/assets/minefluence/models/block/machineBlocks_hyperworker.json src/main/resources/assets/minefluence/models/block/machineBlockWorker.hyperworker.json src/main/resources/assets/minefluence/blockstates/machineBlocks.json src/main/resources/assets/minefluence/models/item/machineBlocks_hyperworker.json src/main/resources/assets/minefluence/models/item/machineBlocks_worker.json src/main/resources/assets/minefluence/models/block/machineBlocks_display.json src/main/resources/assets/minefluence/models/block/machineBlockCooler.fan.json src/main/resources/assets/minefluence/blockstates/machineBlockCore.json src/main/resources/assets/minefluence/models/block/machineBlocks_watercooling.json src/main/java/net/ocine/minefluence/blocks/MachineBlockCore.java src/main/resources/assets/minefluence/models/block/machineBlockWorker.worker.json src/main/resources/assets/minefluence/blockstates/machineBlockInput.json src/main/java/net/ocine/minefluence/renderer/blocks/MachineBlockRenderer.java src/main/resources/assets/minefluence/models/block/machineBlocks_worker.json src/main/java/net/ocine/minefluence/blocks/tileentities/TileEntityCore.java src/main/resources/assets/minefluence/models/block/machineBlockCore.json src/main/java/net/ocine/minefluence/models/ModelMachineBlockBlock.java #31 add border to core (flo.e3)https://ci.codecrafter47.de/view/all/job/MineFluence/31/changes#detail1view/all/job/MineFluence/31/changes#detail1Sat, 28 Mar 2015 16:32:51 +0100jenkins@server4.codecrafter47.desrc/main/java/net/ocine/minefluence/blocks/MachineBlockCore.java src/main/java/net/ocine/minefluence/blocks/tileentities/IMachinePart.java src/main/java/net/ocine/minefluence/blocks/tileentities/TileEntityCore.java src/main/resources/assets/minefluence/models/block/machineBlockCore_green.json src/main/resources/assets/minefluence/blockstates/machineBlockCore.json src/main/resources/assets/minefluence/models/block/machineBlockCore_red.json #31 add border to machine parts (flo.e3)https://ci.codecrafter47.de/view/all/job/MineFluence/31/changes#detail2view/all/job/MineFluence/31/changes#detail2Sat, 28 Mar 2015 16:32:51 +0100jenkins@server4.codecrafter47.desrc/main/resources/assets/minefluence/models/block/machineBlockOutput_green.json src/main/java/net/ocine/minefluence/blocks/tileentities/TileEntityMachinePart.java src/main/resources/assets/minefluence/models/block/machineBlockWorker.worker_red.json src/main/resources/assets/minefluence/models/block/machineBlockInput_red.json src/main/resources/assets/minefluence/models/block/machineBlockInput_green.json src/main/resources/assets/minefluence/models/block/machineBlockCooler.fan_green.json src/main/resources/assets/minefluence/blockstates/machineBlockWorker.json src/main/resources/assets/minefluence/models/block/machineBlockCooler.fan_red.json src/main/java/net/ocine/minefluence/blocks/MachineBlockInput.java src/main/resources/assets/minefluence/models/block/machineBlockOutput_red.json src/main/java/net/ocine/minefluence/blocks/MachineBlockDisplay.java src/main/resources/assets/minefluence/blockstates/machineBlockDisplay.json src/main/java/net/ocine/minefluence/blocks/MachineBlockOutput.java src/main/resources/assets/minefluence/blockstates/machineBlockOutput.json src/main/resources/assets/minefluence/blockstates/machineBlockCooler.json src/main/resources/assets/minefluence/models/block/machineBlockDisplay_red.json src/main/resources/assets/minefluence/models/block/machineBlockCooler.watercooling_green.json src/main/resources/assets/minefluence/models/block/machineBlockWorker.worker_green.json src/main/resources/assets/minefluence/models/block/machineBlockWorker.hyperworker_green.json src/main/resources/assets/minefluence/models/block/machineBlockWorker.hyperworker_red.json src/main/java/net/ocine/minefluence/blocks/MachineBlockCooler.java src/main/java/net/ocine/minefluence/blocks/tileentities/TileEntityGuiMachinePart.java src/main/resources/assets/minefluence/models/block/machineBlockDisplay_green.json src/main/java/net/ocine/minefluence/blocks/MachineBlockWorker.java src/main/resources/assets/minefluence/models/block/machineBlockCooler.watercooling_red.json src/main/resources/assets/minefluence/blockstates/machineBlockInput.json src/main/java/net/ocine/minefluence/blocks/tileentities/TileEntityCore.java #31 add display progress (flo.e3)https://ci.codecrafter47.de/view/all/job/MineFluence/31/changes#detail3view/all/job/MineFluence/31/changes#detail3Sat, 28 Mar 2015 16:32:51 +0100jenkins@server4.codecrafter47.desrc/main/resources/assets/minefluence/models/block/machineBlockDisplay_0.json src/main/resources/assets/minefluence/models/block/machineBlockDisplay_3.json src/main/resources/assets/minefluence/models/block/machineBlockDisplay_green.json src/main/resources/assets/minefluence/models/block/machineBlockDisplay_red.json src/main/resources/assets/minefluence/models/block/machineBlockDisplay_2.json src/main/resources/assets/minefluence/models/block/machineBlockDisplay_1.json src/main/java/net/ocine/minefluence/blocks/MachineBlockDisplay.java src/main/resources/assets/minefluence/models/block/machineBlockDisplay_4.json src/main/resources/assets/minefluence/blockstates/machineBlockDisplay.json #30 use correct models for machine blocks in inventory; references #6 (flo.e3)https://ci.codecrafter47.de/view/all/job/MineFluence/30/changes#detail0view/all/job/MineFluence/30/changes#detail0Wed, 25 Mar 2015 17:48:16 +0100jenkins@server4.codecrafter47.desrc/main/resources/assets/minefluence/models/block/machineBlocks_watercooling.json src/main/resources/assets/minefluence/models/block/machineBlocks_input.json src/main/resources/assets/minefluence/textures/blocks/mblock_flair_gray.png src/main/resources/assets/minefluence/models/block/machineBlocks.json src/main/resources/assets/minefluence/models/block/machineBlocks_hyperworker.json src/main/resources/assets/minefluence/models/block/machineBlocks_base.json src/main/resources/assets/minefluence/models/block/machineBlocks_fan.json src/main/resources/assets/minefluence/models/block/machineBlocks_worker.json src/main/resources/assets/minefluence/models/block/machineBlocks_display.json src/main/resources/assets/minefluence/models/block/machineBlocks_output.json #29 store heat in nbt data (flo.e3)https://ci.codecrafter47.de/view/all/job/MineFluence/29/changes#detail0view/all/job/MineFluence/29/changes#detail0Wed, 25 Mar 2015 09:10:47 +0100jenkins@server4.codecrafter47.desrc/main/java/net/ocine/minefluence/blocks/tileentities/TileEntityCore.java #28 fix a bug introduced by nico (flo.e3)https://ci.codecrafter47.de/view/all/job/MineFluence/28/changes#detail0view/all/job/MineFluence/28/changes#detail0Wed, 25 Mar 2015 09:02:07 +0100jenkins@server4.codecrafter47.desrc/main/java/net/ocine/minefluence/blocks/tileentities/TileEntityCore.java #27 fix textures (flo.e3)https://ci.codecrafter47.de/view/all/job/MineFluence/27/changes#detail0view/all/job/MineFluence/27/changes#detail0Wed, 25 Mar 2015 09:00:42 +0100jenkins@server4.codecrafter47.desrc/main/resources/assets/minefluence/textures/blocks/mblock_fan.png src/main/resources/assets/minefluence/textures/blocks/mblock_watercooling.png src/main/resources/assets/minefluence/textures/blocks/machineblocks/machineblock_fan.png src/main/resources/assets/minefluence/textures/blocks/machineblocks/machineblock_watercooling.png #26 make TileEntityCooler serializable (flo.e3)https://ci.codecrafter47.de/view/all/job/MineFluence/26/changes#detail0view/all/job/MineFluence/26/changes#detail0Wed, 25 Mar 2015 08:49:12 +0100jenkins@server4.codecrafter47.desrc/main/java/net/ocine/minefluence/blocks/tileentities/TileEntityCooler.java #25 make TileEntityCooler serializable (flo.e3)https://ci.codecrafter47.de/view/all/job/MineFluence/25/changes#detail0view/all/job/MineFluence/25/changes#detail0Wed, 25 Mar 2015 08:47:02 +0100jenkins@server4.codecrafter47.desrc/main/java/net/ocine/minefluence/blocks/tileentities/TileEntityCooler.java #24 fix a crash when placing the cooler (flo.e3)https://ci.codecrafter47.de/view/all/job/MineFluence/24/changes#detail0view/all/job/MineFluence/24/changes#detail0Wed, 25 Mar 2015 08:41:32 +0100jenkins@server4.codecrafter47.desrc/main/java/net/ocine/minefluence/blocks/tileentities/TileEntityCooler.java #23 make render stuff client only (flo.e3)https://ci.codecrafter47.de/view/all/job/MineFluence/23/changes#detail0view/all/job/MineFluence/23/changes#detail0Wed, 25 Mar 2015 08:40:57 +0100jenkins@server4.codecrafter47.desrc/main/java/net/ocine/minefluence/blocks/tileentities/IMachinePart.java src/main/java/net/ocine/minefluence/blocks/tileentities/TileEntityCooler.java src/main/java/net/ocine/minefluence/blocks/tileentities/TileEntityOutput.java src/main/java/net/ocine/minefluence/blocks/tileentities/TileEntityInput.java src/main/java/net/ocine/minefluence/blocks/MachineBlocks.java src/main/java/net/ocine/minefluence/blocks/tileentities/TileEntityWorker.java src/main/java/net/ocine/minefluence/renderer/blocks/MachineBlockRenderer.java src/main/java/net/ocine/minefluence/blocks/tileentities/TileEntityCore.java src/main/java/net/ocine/minefluence/blocks/tileentities/TileEntityDisplay.java src/main/java/net/ocine/minefluence/blocks/tileentities/TileEntityHyperworker.java #22 Revert "Added GSON for Bacteria Serialization" (flo.e3)https://ci.codecrafter47.de/view/all/job/MineFluence/22/changes#detail0view/all/job/MineFluence/22/changes#detail0Wed, 25 Mar 2015 07:31:32 +0100jenkins@server4.codecrafter47.delibs/google-gson-2.2.4/gson-2.2.4-sources.jar libs/google-gson-2.2.4/README libs/google-gson-2.2.4/gson-2.2.4-javadoc.jar libs/google-gson-2.2.4/gson-2.2.4.jar libs/google-gson-2.2.4/LICENSE #21 Added GSON for Bacteria Serialization (unknown)https://ci.codecrafter47.de/view/all/job/MineFluence/21/changes#detail0view/all/job/MineFluence/21/changes#detail0Tue, 24 Mar 2015 23:18:21 +0100jenkins@server4.codecrafter47.delibs/google-gson-2.2.4/README libs/google-gson-2.2.4/gson-2.2.4-sources.jar libs/google-gson-2.2.4/gson-2.2.4-javadoc.jar libs/google-gson-2.2.4/gson-2.2.4.jar libs/google-gson-2.2.4/LICENSE #20 Create README.md (nico.gruendel)https://ci.codecrafter47.de/view/all/job/MineFluence/20/changes#detail0view/all/job/MineFluence/20/changes#detail0Tue, 24 Mar 2015 23:00:16 +0100jenkins@server4.codecrafter47.deREADME.md #19 Heat Generation now scales with the amount of Hooked up Workers (unknown)https://ci.codecrafter47.de/view/all/job/MineFluence/19/changes#detail0view/all/job/MineFluence/19/changes#detail0Tue, 24 Mar 2015 22:40:06 +0100jenkins@server4.codecrafter47.desrc/main/java/net/ocine/minefluence/machines/Machine.java src/main/java/net/ocine/minefluence/blocks/tileentities/TileEntityCore.java #18 fix another mistakes in nicos commit (flo.e3)https://ci.codecrafter47.de/view/all/job/MineFluence/18/changes#detail0view/all/job/MineFluence/18/changes#detail0Tue, 24 Mar 2015 22:07:06 +0100jenkins@server4.codecrafter47.desrc/main/java/net/ocine/minefluence/blocks/tileentities/TileEntityCooler.java #17 add fan texture (flo.e3)https://ci.codecrafter47.de/view/all/job/MineFluence/17/changes#detail0view/all/job/MineFluence/17/changes#detail0Tue, 24 Mar 2015 22:04:46 +0100jenkins@server4.codecrafter47.desrc/main/resources/assets/minefluence/textures/blocks/mblock_fan.png #17 Revert "ne textur die jemand wohin verschieben kann" (flo.e3)https://ci.codecrafter47.de/view/all/job/MineFluence/17/changes#detail1view/all/job/MineFluence/17/changes#detail1Tue, 24 Mar 2015 22:04:46 +0100jenkins@server4.codecrafter47.debuild/resources/main/assets/minefluence/textures/blocks/mblock_fan_draft.png #16 fix another mistakes in nicos commit (flo.e3)https://ci.codecrafter47.de/view/all/job/MineFluence/16/changes#detail0view/all/job/MineFluence/16/changes#detail0Tue, 24 Mar 2015 21:59:05 +0100jenkins@server4.codecrafter47.desrc/main/java/net/ocine/minefluence/blocks/tileentities/TileEntityCooler.java #15 ne textur die jemand wohin verschieben kann (mrmaxmeier)https://ci.codecrafter47.de/view/all/job/MineFluence/15/changes#detail0view/all/job/MineFluence/15/changes#detail0Tue, 24 Mar 2015 21:58:46 +0100jenkins@server4.codecrafter47.debuild/resources/main/assets/minefluence/textures/blocks/mblock_fan_draft.png #14 fix one more mistakes in nicos commit (flo.e3)https://ci.codecrafter47.de/view/all/job/MineFluence/14/changes#detail0view/all/job/MineFluence/14/changes#detail0Tue, 24 Mar 2015 21:55:46 +0100jenkins@server4.codecrafter47.desrc/main/java/net/ocine/minefluence/proxys/CommonProxy.java #13 fix most obvious mistakes in nicos commit (flo.e3)https://ci.codecrafter47.de/view/all/job/MineFluence/13/changes#detail0view/all/job/MineFluence/13/changes#detail0Tue, 24 Mar 2015 21:51:56 +0100jenkins@server4.codecrafter47.desrc/main/resources/assets/minefluence/models/block/machineBlocks_watercooling.json src/main/resources/assets/minefluence/lang/de_DE.lang src/main/resources/assets/minefluence/lang/en_US.lang src/main/resources/assets/minefluence/blockstates/machineBlocks.json src/main/resources/assets/minefluence/models/item/machineBlocks_watercooling.json src/main/java/net/ocine/minefluence/blocks/MachineBlocks.java src/main/resources/assets/minefluence/models/block/machineBlocks_fan.json src/main/java/net/ocine/minefluence/proxys/ClientProxy.java src/main/resources/assets/minefluence/models/item/machineBlocks_fan.json #12 Added temperature, fan and watercooling (AND EXPLOSCHUNS) (unknown)https://ci.codecrafter47.de/view/all/job/MineFluence/12/changes#detail0view/all/job/MineFluence/12/changes#detail0Tue, 24 Mar 2015 21:36:01 +0100jenkins@server4.codecrafter47.desrc/main/java/net/ocine/minefluence/blocks/tileentities/TileEntityCooler.java src/main/java/net/ocine/minefluence/machines/AbstractMachineLogic.java src/main/java/net/ocine/minefluence/blocks/MachineBlocks.java src/main/java/net/ocine/minefluence/machines/MachineLogicManager.java src/main/java/net/ocine/minefluence/machines/TransformationLogic.java src/main/java/net/ocine/minefluence/blocks/tileentities/TileEntityCore.java src/main/java/net/ocine/minefluence/machines/Machine.java #11 fix spelling (flo.e3)https://ci.codecrafter47.de/view/all/job/MineFluence/11/changes#detail0view/all/job/MineFluence/11/changes#detail0Tue, 24 Mar 2015 20:07:15 +0100jenkins@server4.codecrafter47.desrc/main/java/net/ocine/minefluence/blocks/MachineBlocks.java #9 Added Redstone-Support to the Core Block (unknown)https://ci.codecrafter47.de/view/all/job/MineFluence/9/changes#detail0view/all/job/MineFluence/9/changes#detail0Tue, 24 Mar 2015 20:02:30 +0100jenkins@server4.codecrafter47.desrc/main/java/net/ocine/minefluence/blocks/tileentities/TileEntityCore.java src/main/java/net/ocine/minefluence/blocks/MachineBlocks.java #6 cleanup code (flo.e3)https://ci.codecrafter47.de/view/all/job/MineFluence/6/changes#detail0view/all/job/MineFluence/6/changes#detail0Tue, 24 Mar 2015 19:21:35 +0100jenkins@server4.codecrafter47.desrc/main/java/net/ocine/minefluence/blocks/tileentities/TileEntityMachinePart.java src/main/java/net/ocine/minefluence/blocks/tileentities/TileEntityDisplay.java src/main/java/net/ocine/minefluence/blocks/tileentities/TileEntityCore.java src/main/java/net/ocine/minefluence/items/ItemBacteriaFlask.java src/main/java/net/ocine/minefluence/blocks/tileentities/TileEntityGuiMachinePart.java #6 change version / final jar name (flo.e3)https://ci.codecrafter47.de/view/all/job/MineFluence/6/changes#detail1view/all/job/MineFluence/6/changes#detail1Tue, 24 Mar 2015 19:21:35 +0100jenkins@server4.codecrafter47.debuild.gradle #5 remove more scala (flo.e3)https://ci.codecrafter47.de/view/all/job/MineFluence/5/changes#detail0view/all/job/MineFluence/5/changes#detail0Tue, 24 Mar 2015 18:37:03 +0100jenkins@server4.codecrafter47.desrc/main/java/net/ocine/minefluence/blocks/tileentities/TileEntityCore.java #4 remove scala dependency (flo.e3)https://ci.codecrafter47.de/view/all/job/MineFluence/4/changes#detail0view/all/job/MineFluence/4/changes#detail0Tue, 24 Mar 2015 18:30:46 +0100jenkins@server4.codecrafter47.desrc/main/java/net/ocine/minefluence/machines/MachineLogicManager.java