[Jenkins]Jenkins

SuccessChanges

Summary

  1. split machine blocks into separate blocks (commit: 927eb28) (details)
  2. add border to core (commit: 8a01a68) (details)
  3. add border to machine parts (commit: b846f44) (details)
  4. add display progress (commit: 686eb80) (details)
Commit 927eb28e4a2a6cba5ca454fb8e4668e4a5d6ac56 by Flo.e3
split machine blocks into separate blocks
 (commit: 927eb28)
The file was addedsrc/main/resources/assets/minefluence/models/block/machineBlockWorker.hyperworker.json
The file was removedsrc/main/resources/assets/minefluence/models/item/machineBlocks_output.json
The file was removedsrc/main/resources/assets/minefluence/blockstates/machineBlocks.json
The file was removedsrc/main/java/net/ocine/minefluence/blocks/MachineBlocks.java
The file was modifiedsrc/main/resources/assets/minefluence/lang/de_DE.lang (diff)
The file was addedsrc/main/resources/assets/minefluence/blockstates/machineBlockDisplay.json
The file was modifiedsrc/main/resources/assets/minefluence/lang/en_US.lang (diff)
The file was addedsrc/main/java/net/ocine/minefluence/blocks/MachineBlockOutput.java
The file was removedsrc/main/resources/assets/minefluence/models/block/machineBlocks_display.json
The file was removedsrc/main/java/net/ocine/minefluence/models/ModelMachineBlockBorder.java
The file was removedsrc/main/resources/assets/minefluence/models/block/machineBlocks_input.json
The file was removedsrc/main/resources/assets/minefluence/models/item/machineBlocks_fan.json
The file was addedsrc/main/resources/assets/minefluence/models/item/machineBlockCooler.fan.json
The file was addedsrc/main/resources/assets/minefluence/models/item/machineBlockCore.json
The file was addedsrc/main/resources/assets/minefluence/models/item/machineBlockDisplay.json
The file was addedsrc/main/resources/assets/minefluence/models/block/machineBlockOutput.json
The file was removedsrc/main/resources/assets/minefluence/models/block/machineBlocks_worker.json
The file was removedsrc/main/resources/assets/minefluence/models/item/machineBlocks_worker.json
The file was modifiedsrc/main/java/net/ocine/minefluence/blocks/tileentities/TileEntityWorker.java (diff)
The file was addedsrc/main/java/net/ocine/minefluence/blocks/MachineBlockDisplay.java
The file was addedsrc/main/resources/assets/minefluence/blockstates/machineBlockWorker.json
The file was modifiedsrc/main/java/net/ocine/minefluence/blocks/tileentities/TileEntityHyperworker.java (diff)
The file was addedsrc/main/java/net/ocine/minefluence/blocks/MachineBlockCoolerItem.java
The file was modifiedsrc/main/java/net/ocine/minefluence/proxys/ClientProxy.java (diff)
The file was addedsrc/main/resources/assets/minefluence/blockstates/machineBlockCore.json
The file was addedsrc/main/java/net/ocine/minefluence/blocks/MachineBlockInput.java
The file was addedsrc/main/resources/assets/minefluence/models/block/machineBlockDisplay.json
The file was removedsrc/main/resources/assets/minefluence/models/block/machineBlocks_watercooling.json
The file was removedsrc/main/java/net/ocine/minefluence/blocks/MachineBlocksItemBlock.java
The file was addedsrc/main/java/net/ocine/minefluence/blocks/MachineBlockWorker.java
The file was addedsrc/main/resources/assets/minefluence/models/block/machineBlockCooler.watercooling.json
The file was removedsrc/main/resources/assets/minefluence/models/block/machineBlocks.json
The file was addedsrc/main/resources/assets/minefluence/models/block/machineBlockCore.json
The file was addedsrc/main/java/net/ocine/minefluence/blocks/MachineBlockWorkerItem.java
The file was modifiedsrc/main/java/net/ocine/minefluence/blocks/tileentities/TileEntityOutput.java (diff)
The file was addedsrc/main/resources/assets/minefluence/models/item/machineBlockInput.json
The file was removedsrc/main/resources/assets/minefluence/models/block/machineBlocks_hyperworker.json
The file was removedsrc/main/resources/assets/minefluence/models/item/machineBlocks_hyperworker.json
The file was modifiedsrc/main/java/net/ocine/minefluence/blocks/Blocks.java (diff)
The file was removedsrc/main/resources/assets/minefluence/models/block/machineBlocks_output.json
The file was addedsrc/main/resources/assets/minefluence/blockstates/machineBlockCooler.json
The file was addedsrc/main/resources/assets/minefluence/blockstates/machineBlockInput.json
The file was removedsrc/main/resources/assets/minefluence/models/block/machineBlocks_fan.json
The file was addedsrc/main/resources/assets/minefluence/models/item/machineBlockOutput.json
The file was modifiedsrc/main/java/net/ocine/minefluence/blocks/tileentities/TileEntityInput.java (diff)
The file was addedsrc/main/java/net/ocine/minefluence/blocks/MachineBlockCooler.java
The file was modifiedsrc/main/java/net/ocine/minefluence/blocks/tileentities/TileEntityCooler.java (diff)
The file was addedsrc/main/resources/assets/minefluence/blockstates/machineBlockOutput.json
The file was removedsrc/main/resources/assets/minefluence/models/item/machineBlocks.json
The file was addedsrc/main/resources/assets/minefluence/models/item/machineBlockWorker.worker.json
The file was removedsrc/main/resources/assets/minefluence/models/item/machineBlocks_input.json
The file was addedsrc/main/resources/assets/minefluence/models/block/machineBlockInput.json
The file was removedsrc/main/java/net/ocine/minefluence/renderer/blocks/MachineBlockRenderer.java
The file was addedsrc/main/resources/assets/minefluence/models/block/machineBlockCooler.fan.json
The file was addedsrc/main/resources/assets/minefluence/models/block/machineBlockWorker.worker.json
The file was removedsrc/main/resources/assets/minefluence/models/item/machineBlocks_watercooling.json
The file was removedsrc/main/resources/assets/minefluence/models/item/machineBlocks_display.json
The file was addedsrc/main/java/net/ocine/minefluence/blocks/MachineBlockCore.java
The file was modifiedsrc/main/java/net/ocine/minefluence/blocks/tileentities/TileEntityDisplay.java (diff)
The file was removedsrc/main/java/net/ocine/minefluence/models/ModelMachineBlockBlock.java
The file was modifiedsrc/main/java/net/ocine/minefluence/blocks/tileentities/TileEntityCore.java (diff)
The file was modifiedsrc/main/java/net/ocine/minefluence/blocks/tileentities/IMachinePart.java (diff)
The file was addedsrc/main/resources/assets/minefluence/models/item/machineBlockWorker.hyperworker.json
The file was addedsrc/main/resources/assets/minefluence/models/item/machineBlockCooler.watercooling.json
The file was addedsrc/main/resources/assets/minefluence/models/block/machineBlockCore_green.json
The file was addedsrc/main/resources/assets/minefluence/models/block/machineBlockCore_red.json
The file was modifiedsrc/main/java/net/ocine/minefluence/blocks/tileentities/TileEntityCore.java (diff)
The file was modifiedsrc/main/java/net/ocine/minefluence/blocks/MachineBlockCore.java (diff)
The file was modifiedsrc/main/resources/assets/minefluence/blockstates/machineBlockCore.json (diff)
The file was modifiedsrc/main/java/net/ocine/minefluence/blocks/tileentities/IMachinePart.java (diff)
Commit b846f44214cd31764c88992b292b11f6c258a75b by Flo.e3
add border to machine parts
 (commit: b846f44)
The file was modifiedsrc/main/java/net/ocine/minefluence/blocks/tileentities/TileEntityMachinePart.java (diff)
The file was addedsrc/main/resources/assets/minefluence/models/block/machineBlockWorker.hyperworker_green.json
The file was addedsrc/main/resources/assets/minefluence/models/block/machineBlockWorker.worker_red.json
The file was modifiedsrc/main/resources/assets/minefluence/blockstates/machineBlockWorker.json (diff)
The file was modifiedsrc/main/java/net/ocine/minefluence/blocks/MachineBlockWorker.java (diff)
The file was modifiedsrc/main/java/net/ocine/minefluence/blocks/MachineBlockCooler.java (diff)
The file was modifiedsrc/main/java/net/ocine/minefluence/blocks/MachineBlockInput.java (diff)
The file was addedsrc/main/resources/assets/minefluence/models/block/machineBlockInput_green.json
The file was addedsrc/main/resources/assets/minefluence/models/block/machineBlockDisplay_green.json
The file was modifiedsrc/main/java/net/ocine/minefluence/blocks/MachineBlockDisplay.java (diff)
The file was modifiedsrc/main/java/net/ocine/minefluence/blocks/MachineBlockOutput.java (diff)
The file was modifiedsrc/main/resources/assets/minefluence/blockstates/machineBlockOutput.json (diff)
The file was addedsrc/main/resources/assets/minefluence/models/block/machineBlockCooler.watercooling_green.json
The file was addedsrc/main/resources/assets/minefluence/models/block/machineBlockOutput_green.json
The file was modifiedsrc/main/resources/assets/minefluence/blockstates/machineBlockDisplay.json (diff)
The file was modifiedsrc/main/java/net/ocine/minefluence/blocks/tileentities/TileEntityGuiMachinePart.java (diff)
The file was addedsrc/main/resources/assets/minefluence/models/block/machineBlockDisplay_red.json
The file was addedsrc/main/resources/assets/minefluence/models/block/machineBlockWorker.hyperworker_red.json
The file was addedsrc/main/resources/assets/minefluence/models/block/machineBlockCooler.fan_green.json
The file was modifiedsrc/main/java/net/ocine/minefluence/blocks/tileentities/TileEntityCore.java (diff)
The file was addedsrc/main/resources/assets/minefluence/models/block/machineBlockCooler.fan_red.json
The file was addedsrc/main/resources/assets/minefluence/models/block/machineBlockInput_red.json
The file was addedsrc/main/resources/assets/minefluence/models/block/machineBlockCooler.watercooling_red.json
The file was addedsrc/main/resources/assets/minefluence/models/block/machineBlockWorker.worker_green.json
The file was modifiedsrc/main/resources/assets/minefluence/blockstates/machineBlockCooler.json (diff)
The file was modifiedsrc/main/resources/assets/minefluence/blockstates/machineBlockInput.json (diff)
The file was addedsrc/main/resources/assets/minefluence/models/block/machineBlockOutput_red.json
The file was removedsrc/main/resources/assets/minefluence/models/block/machineBlockDisplay_red.json
The file was addedsrc/main/resources/assets/minefluence/models/block/machineBlockDisplay_0.json
The file was modifiedsrc/main/resources/assets/minefluence/models/block/machineBlockDisplay_green.json (diff)
The file was addedsrc/main/resources/assets/minefluence/models/block/machineBlockDisplay_1.json
The file was addedsrc/main/resources/assets/minefluence/models/block/machineBlockDisplay_2.json
The file was addedsrc/main/resources/assets/minefluence/models/block/machineBlockDisplay_3.json
The file was addedsrc/main/resources/assets/minefluence/models/block/machineBlockDisplay_4.json
The file was modifiedsrc/main/java/net/ocine/minefluence/blocks/MachineBlockDisplay.java (diff)
The file was modifiedsrc/main/resources/assets/minefluence/blockstates/machineBlockDisplay.json (diff)