Checks feature branches and keeps feature branches up to date

Build: #3 failed Changes by 3 people

Code commits

SteamNSteel Devel

  • Steven Blom

    Steven Blom 79f8d83c8b58dc0c1c51c1e5dbabb4317421026f

    GetActualState should be deprecated

    • src/main/java/mod/steamnsteel/block/resource/structure/RemnantRuinPillarBlock.java (version 79f8d83c8b58dc0c1c51c1e5dbabb4317421026f)
  • Steven Blom

    Steven Blom 9f8158722752acb9494679d5c6f8fb0372c8f551

    Merge branch 'feature/1.10-Upgrade' into feature/1.10-Project-Table-Updates

  • Steven Blom

    Steven Blom cfe17e6b0c1284ada26683903f9652a72a8deff3

    Update Project Table GUI and fix all known bugs

    • src/main/java/mod/steamnsteel/client/gui/ProjectTableGui.java (version cfe17e6b0c1284ada26683903f9652a72a8deff3)
    • src/main/java/mod/steamnsteel/crafting/projecttable/ProjectTableRecipe.java (version cfe17e6b0c1284ada26683903f9652a72a8deff3)
    • src/main/java/mod/steamnsteel/inventory/ProjectTableContainer.java (version cfe17e6b0c1284ada26683903f9652a72a8deff3)
    • src/main/java/mod/steamnsteel/networking/PacketBufferExtensions.java (version cfe17e6b0c1284ada26683903f9652a72a8deff3)
    • src/main/java/mod/steamnsteel/networking/ProjectTableCraftPacketMessageHandler.java (version cfe17e6b0c1284ada26683903f9652a72a8deff3)
    • src/main/java/mod/steamnsteel/networking/serialization/ItemStackIngredientSerializer.java (version cfe17e6b0c1284ada26683903f9652a72a8deff3)
    • src/main/resources/assets/steamnsteel/textures/gui/SSCraftingTableGUI.png (version cfe17e6b0c1284ada26683903f9652a72a8deff3)
  • Steven Blom

    Steven Blom 62387d99f0faa2dffebc2cd7ac54cd01168d60e9

    Update to 1.10.2

    • build.properties (version 62387d99f0faa2dffebc2cd7ac54cd01168d60e9)
  • Steven Blom

    Steven Blom 710cd041f7e0875aac63f0608f690f030e2b8b1a

    Changes to support 1.10

    • build.properties (version 710cd041f7e0875aac63f0608f690f030e2b8b1a)
    • src/main/java/mod/steamnsteel/proxy/CommonNetworkProxy.java (version 710cd041f7e0875aac63f0608f690f030e2b8b1a)
    • src/main/java/mod/steamnsteel/utility/blockParts/BlockPart.java (version 710cd041f7e0875aac63f0608f690f030e2b8b1a)
    • src/main/java/mod/steamnsteel/world/SchematicLoader.java (version 710cd041f7e0875aac63f0608f690f030e2b8b1a)
  • Foudroyant Factotum

    Foudroyant Factotum 695edf54a9dfbc1ebf4300c9bd3a63ac9fdff61e

    Fixed Pipe Cap positions

    • src/main/java/mod/steamnsteel/client/codemodel/PipeModel.java (version 695edf54a9dfbc1ebf4300c9bd3a63ac9fdff61e)
  • Foudroyant Factotum

    Foudroyant Factotum cd89de898a2c9a7fa396c785121a27602218edbd

    Updated Structure interface & version

    • build.properties (version cd89de898a2c9a7fa396c785121a27602218edbd)
    • src/main/java/mod/steamnsteel/proxy/ClientNetworkProxy.java (version cd89de898a2c9a7fa396c785121a27602218edbd)
    • src/main/java/mod/steamnsteel/proxy/CommonNetworkProxy.java (version cd89de898a2c9a7fa396c785121a27602218edbd)
  • Steven Blom

    Steven Blom 3c45007fdc2acbb4a942bcaba6dbca028548e7ad

    Fix localization of Remnant Ruin Chest

    • src/main/java/mod/steamnsteel/tileentity/RemnantRuinChestTE.java (version 3c45007fdc2acbb4a942bcaba6dbca028548e7ad)
  • Steven Blom

    Steven Blom 4b183e9d82cac7efb494735408d3f7c91a4274f3

    Fix crashes related to pipes

    • src/main/java/mod/steamnsteel/tileentity/PipeTE.java (version 4b183e9d82cac7efb494735408d3f7c91a4274f3)
  • Atlassian Bamboo <bamboo@example.com>

    Atlassian Bamboo <bamboo@example.com> 399eb2e47decfe1448fbc20ec803a83734161439

    [bamboo] Automated branch merge (from develop:619a4206c1bccd209e3dc600236013b61dcebaa0)

  • Steven Blom

    Steven Blom 81e3771f51df9f2d01e205b0f46b05607a00b454 m

    Revert mcgui and structure to using artifactory by default

    • build.properties (version 81e3771f51df9f2d01e205b0f46b05607a00b454)
    • src/main/java/mod/steamnsteel/block/resource/structure/ConcreteBlock.java (version 81e3771f51df9f2d01e205b0f46b05607a00b454)
  • Steven Blom

    Steven Blom d448fcf509cdbbae70e4226e7b62fb6bf1d326a0 m

    Whoops, checked in a bad mapping snapshot

    • build.properties (version d448fcf509cdbbae70e4226e7b62fb6bf1d326a0)
  • Steven Blom

    Steven Blom 77387d0b705d12ab44a19189eaff35a9b84aeef4 m

    Add cap state to pillars

    • src/main/java/mod/steamnsteel/block/resource/structure/RemnantRuinPillarBlock.java (version 77387d0b705d12ab44a19189eaff35a9b84aeef4)
    • src/main/resources/assets/steamnsteel/blockstates/remnantRuinPillar.json (version 77387d0b705d12ab44a19189eaff35a9b84aeef4)
  • Steven Blom

    Steven Blom fff3001c487513f111578c874453af0dd5e1094b m

    Remove NEI code

    • build.gradle (version fff3001c487513f111578c874453af0dd5e1094b)
    • src/main/java/mod/steamnsteel/nei/CupolaRecipeHandler.java (version fff3001c487513f111578c874453af0dd5e1094b)
    • src/main/java/mod/steamnsteel/nei/NEISteamNSteelConfig.java (version fff3001c487513f111578c874453af0dd5e1094b)
  • Steven Blom

    Steven Blom 8e4d4e44f49177b75ce6d26335968d1a904aa053 m

    Small code improvements

    • src/main/java/mod/steamnsteel/client/gui/ProjectTableGui.java (version 8e4d4e44f49177b75ce6d26335968d1a904aa053)
    • src/main/java/mod/steamnsteel/texturing/api/ProceduralWallFeatureBase.java (version 8e4d4e44f49177b75ce6d26335968d1a904aa053)
    • src/main/java/mod/steamnsteel/world/WorldGen.java (version 8e4d4e44f49177b75ce6d26335968d1a904aa053)
    • src/main/java/mod/steamnsteel/world/structure/RemnantRuinsGenerator.java (version 8e4d4e44f49177b75ce6d26335968d1a904aa053)
    • src/main/java/mod/steamnsteel/world/structure/StructureGenerator.java (version 8e4d4e44f49177b75ce6d26335968d1a904aa053)
    • src/main/java/mod/steamnsteel/world/structure/remnantruins/RuinRing.java (version 8e4d4e44f49177b75ce6d26335968d1a904aa053)
  • Steven Blom

    Steven Blom bb9f4cdf3a8f8add6e7b9e940ffcdc0b385ca7a9 m

    Clear PCT model cache when reloading resources

    • src/main/java/mod/steamnsteel/client/model/pct/PCTModelInstance.java (version bb9f4cdf3a8f8add6e7b9e940ffcdc0b385ca7a9)
    • src/main/java/mod/steamnsteel/client/model/pct/PCTModelLoader.java (version bb9f4cdf3a8f8add6e7b9e940ffcdc0b385ca7a9)
  • Steven Blom

    Steven Blom 52b607c9e7fef7e041e1cca7f080f7fa76ab1482 m

    Inventory model for the Ruin Walls

    • src/main/resources/assets/steamnsteel/blockstates/remnantRuinWall.json (version 52b607c9e7fef7e041e1cca7f080f7fa76ab1482)
  • Steven Blom

    Steven Blom e71ab72998b4f512a252963bfa2398f034ba719e m

    Fixed Connected Textures

    • src/main/java/mod/steamnsteel/client/model/pct/PCTModelInstance.java (version e71ab72998b4f512a252963bfa2398f034ba719e)
    • src/main/java/mod/steamnsteel/client/model/pct/PCTModelLoader.java (version e71ab72998b4f512a252963bfa2398f034ba719e)
    • src/main/resources/assets/steamnsteel/blockstates/remnantRuinFloor.json (version e71ab72998b4f512a252963bfa2398f034ba719e)
  • Steven Blom

    Steven Blom 2c35e872b2287ef415132ca65fddded22dd0f749 m

    Don't use deprecated methods for internationalization.

    • src/main/java/mod/steamnsteel/configuration/Settings.java (version 2c35e872b2287ef415132ca65fddded22dd0f749)
  • Steven Blom

    Steven Blom b0ced142997a0c9ca52f9e53ef5e2b8fa8786024 m

    Update mappings

    • build.properties (version b0ced142997a0c9ca52f9e53ef5e2b8fa8786024)
    • src/main/java/mod/steamnsteel/block/resource/structure/ConcreteBlock.java (version b0ced142997a0c9ca52f9e53ef5e2b8fa8786024)
    • src/main/java/mod/steamnsteel/world/ore/NiterOreGenerator.java (version b0ced142997a0c9ca52f9e53ef5e2b8fa8786024)
    • src/main/java/mod/steamnsteel/world/ore/niter/NiterVeinGeneratorStateMachine.java (version b0ced142997a0c9ca52f9e53ef5e2b8fa8786024)
  • Steven Blom

    Steven Blom 0174680fd1b56647baa5ed191aac5578f4949771 m

    Bring back the Axes

    • src/main/java/mod/steamnsteel/item/tool/SSToolAxe.java (version 0174680fd1b56647baa5ed191aac5578f4949771)
    • src/main/java/mod/steamnsteel/library/ModItem.java (version 0174680fd1b56647baa5ed191aac5578f4949771)
    • src/main/java/mod/steamnsteel/proxy/ClientRenderProxy.java (version 0174680fd1b56647baa5ed191aac5578f4949771)
  • Foudroyant Factotum

    Foudroyant Factotum d2d74a5e2f9b83d2b2ac6d8a2bfe684b90e279e1 m

    Removed dependency of Structure.DIRECTION

    • src/main/java/mod/steamnsteel/block/SteamNSteelDirectionalBlock.java (version d2d74a5e2f9b83d2b2ac6d8a2bfe684b90e279e1)
    • src/main/java/mod/steamnsteel/block/container/RemnantRuinChestBlock.java (version d2d74a5e2f9b83d2b2ac6d8a2bfe684b90e279e1)
    • src/main/java/mod/steamnsteel/block/machine/CupolaBlock.java (version d2d74a5e2f9b83d2b2ac6d8a2bfe684b90e279e1)
    • src/main/java/mod/steamnsteel/block/machine/PipeRedstoneValveBlock.java (version d2d74a5e2f9b83d2b2ac6d8a2bfe684b90e279e1)
    • src/main/java/mod/steamnsteel/block/machine/PipeValveBlock.java (version d2d74a5e2f9b83d2b2ac6d8a2bfe684b90e279e1)
    • src/main/java/mod/steamnsteel/block/machine/structure/FanLargeStructure.java (version d2d74a5e2f9b83d2b2ac6d8a2bfe684b90e279e1)
    • src/main/java/mod/steamnsteel/block/machine/structure/SSBallMillStructure.java (version d2d74a5e2f9b83d2b2ac6d8a2bfe684b90e279e1)
    • src/main/java/mod/steamnsteel/block/machine/structure/SSBlastFurnaceStructure.java (version d2d74a5e2f9b83d2b2ac6d8a2bfe684b90e279e1)
    • src/main/java/mod/steamnsteel/block/machine/structure/SSBoilerStructure.java (version d2d74a5e2f9b83d2b2ac6d8a2bfe684b90e279e1)
    • src/main/java/mod/steamnsteel/item/tool/StructureBuild.java (version d2d74a5e2f9b83d2b2ac6d8a2bfe684b90e279e1)
    • src/main/java/mod/steamnsteel/proxy/CommonNetworkProxy.java (version d2d74a5e2f9b83d2b2ac6d8a2bfe684b90e279e1)
  • Foudroyant Factotum

    Foudroyant Factotum d2bab7de5e439cfccdd83b33b247d3c68ebf7216 m

    Updated Forge version to fix addArmorMaterial bug

    • build.properties (version d2bab7de5e439cfccdd83b33b247d3c68ebf7216)
    • src/main/java/mod/steamnsteel/library/Material.java (version d2bab7de5e439cfccdd83b33b247d3c68ebf7216)
  • Steven Blom

    Steven Blom 9de81204e44eb6ec5930ba3e06ad622e265f3249 m

    Further improvements to the 1.9.4 branch

    • build.gradle (version 9de81204e44eb6ec5930ba3e06ad622e265f3249)
    • build.properties (version 9de81204e44eb6ec5930ba3e06ad622e265f3249)
    • src/main/java/mod/steamnsteel/block/SteamNSteelDirectionalBlock.java (version 9de81204e44eb6ec5930ba3e06ad622e265f3249)
    • src/main/java/mod/steamnsteel/block/SteamNSteelMachineBlock.java (version 9de81204e44eb6ec5930ba3e06ad622e265f3249)
    • src/main/java/mod/steamnsteel/block/container/RemnantRuinChestBlock.java (version 9de81204e44eb6ec5930ba3e06ad622e265f3249)
    • src/main/java/mod/steamnsteel/block/machine/CupolaBlock.java (version 9de81204e44eb6ec5930ba3e06ad622e265f3249)
    • src/main/java/mod/steamnsteel/block/machine/PipeBlock.java (version 9de81204e44eb6ec5930ba3e06ad622e265f3249)
    • src/main/java/mod/steamnsteel/block/machine/PipeJunctionBlock.java (version 9de81204e44eb6ec5930ba3e06ad622e265f3249)
    • src/main/java/mod/steamnsteel/block/machine/PipeRedstoneValveBlock.java (version 9de81204e44eb6ec5930ba3e06ad622e265f3249)
    • src/main/java/mod/steamnsteel/block/machine/PipeValveBlock.java (version 9de81204e44eb6ec5930ba3e06ad622e265f3249)
    • src/main/java/mod/steamnsteel/block/machine/structure/FanLargeStructure.java (version 9de81204e44eb6ec5930ba3e06ad622e265f3249)
    • src/main/java/mod/steamnsteel/block/machine/structure/SSBallMillStructure.java (version 9de81204e44eb6ec5930ba3e06ad622e265f3249)
    • src/main/java/mod/steamnsteel/block/resource/structure/ConcreteBlock.java (version 9de81204e44eb6ec5930ba3e06ad622e265f3249)
    • src/main/java/mod/steamnsteel/block/resource/structure/RemnantRuinIronBarsBlock.java (version 9de81204e44eb6ec5930ba3e06ad622e265f3249)
    • src/main/java/mod/steamnsteel/block/resource/structure/RemnantRuinPillarBlock.java (version 9de81204e44eb6ec5930ba3e06ad622e265f3249)
    • src/main/java/mod/steamnsteel/block/utility/ProjectTableBlock.java (version 9de81204e44eb6ec5930ba3e06ad622e265f3249)
    • src/main/java/mod/steamnsteel/client/model/opengex/OpenGEXModelInstance.java (version 9de81204e44eb6ec5930ba3e06ad622e265f3249)
    • src/main/java/mod/steamnsteel/client/model/pct/PCTModelInstance.java (version 9de81204e44eb6ec5930ba3e06ad622e265f3249)
    • src/main/java/mod/steamnsteel/inventory/CupolaContainer.java (version 9de81204e44eb6ec5930ba3e06ad622e265f3249)
    • src/main/java/mod/steamnsteel/tileentity/BasePlumbingTE.java (version 9de81204e44eb6ec5930ba3e06ad622e265f3249)
    • src/main/java/mod/steamnsteel/tileentity/CupolaTE.java (version 9de81204e44eb6ec5930ba3e06ad622e265f3249)
    • src/main/java/mod/steamnsteel/tileentity/PipeRedstoneValveTE.java (version 9de81204e44eb6ec5930ba3e06ad622e265f3249)
    • src/main/java/mod/steamnsteel/tileentity/PipeValveTE.java (version 9de81204e44eb6ec5930ba3e06ad622e265f3249)
    • src/main/java/mod/steamnsteel/tileentity/RemnantRuinChestTE.java (version 9de81204e44eb6ec5930ba3e06ad622e265f3249)
    • src/main/java/mod/steamnsteel/tileentity/structure/BallMillTE.java (version 9de81204e44eb6ec5930ba3e06ad622e265f3249)
    • src/main/java/mod/steamnsteel/tileentity/structure/BlastFurnaceTE.java (version 9de81204e44eb6ec5930ba3e06ad622e265f3249)
    • src/main/java/mod/steamnsteel/tileentity/structure/BoilerTE.java (version 9de81204e44eb6ec5930ba3e06ad622e265f3249)
    • src/main/java/mod/steamnsteel/world/SchematicLoader.java (version 9de81204e44eb6ec5930ba3e06ad622e265f3249)
    • src/main/java/mod/steamnsteel/world/ore/NiterOreGenerator.java (version 9de81204e44eb6ec5930ba3e06ad622e265f3249)
    • src/main/java/mod/steamnsteel/world/ore/niter/NiterVeinGeneratorStateMachine.java (version 9de81204e44eb6ec5930ba3e06ad622e265f3249)
  • Steven Blom

    Steven Blom 2c80bf102ba390b94467fd99a943b279c96c0f9f m

    remove rogue using statement

    • src/api/java/mod/steamnsteel/api/crafting/IProjectTableManager.java (version 2c80bf102ba390b94467fd99a943b279c96c0f9f)
  • Steven Blom

    Steven Blom 38aae2eaca979b62a0bf5fdf3a1bb8ccc80d43d6 m

    Don't force-append the forge branch number

    • build.gradle (version 38aae2eaca979b62a0bf5fdf3a1bb8ccc80d43d6)
  • Steven Blom

    Steven Blom 2224edd990f0d322eddae0263569c140f8359e48 m

    Update dependencies

    • build.gradle (version 2224edd990f0d322eddae0263569c140f8359e48)
    • build.properties (version 2224edd990f0d322eddae0263569c140f8359e48)
  • Steven Blom

    Steven Blom 97ca522fb5a79772eff3d299615862f6661105dd m

    Working on getting PCT working again

    • src/main/java/mod/steamnsteel/block/resource/structure/RemnantRuinFloorBlock.java (version 97ca522fb5a79772eff3d299615862f6661105dd)
    • src/main/java/mod/steamnsteel/client/model/pct/PCTModelInstance.java (version 97ca522fb5a79772eff3d299615862f6661105dd)
    • src/main/java/mod/steamnsteel/world/SchematicLoader.java (version 97ca522fb5a79772eff3d299615862f6661105dd)
  • Steven Blom

    Steven Blom 48a09d5ddb1e77c7c6910f92786f9e54777c51a5 m

    Messing with inventory rendering

    • src/main/java/mod/steamnsteel/proxy/ClientRenderProxy.java (version 48a09d5ddb1e77c7c6910f92786f9e54777c51a5)
    • src/main/resources/assets/steamnsteel/blockstates/projectTable.json (version 48a09d5ddb1e77c7c6910f92786f9e54777c51a5)
  • Steven Blom

    Steven Blom dd06cdff59dd8d510d6c8e0f60a33a576e3a33a3 m

    Updates for latest forge + merge issues with Project Table

    • build.properties (version dd06cdff59dd8d510d6c8e0f60a33a576e3a33a3)
    • src/main/java/mod/steamnsteel/block/SteamNSteelDirectionalBlock.java (version dd06cdff59dd8d510d6c8e0f60a33a576e3a33a3)
    • src/main/java/mod/steamnsteel/block/SteamNSteelDirectionalStorageBlock.java (version dd06cdff59dd8d510d6c8e0f60a33a576e3a33a3)
    • src/main/java/mod/steamnsteel/block/SteamNSteelMachineBlock.java (version dd06cdff59dd8d510d6c8e0f60a33a576e3a33a3)
    • src/main/java/mod/steamnsteel/block/SteamNSteelOreBlock.java (version dd06cdff59dd8d510d6c8e0f60a33a576e3a33a3)
    • src/main/java/mod/steamnsteel/block/SteamNSteelStorageBlock.java (version dd06cdff59dd8d510d6c8e0f60a33a576e3a33a3)
    • src/main/java/mod/steamnsteel/block/machine/PipeBlock.java (version dd06cdff59dd8d510d6c8e0f60a33a576e3a33a3)
    • src/main/java/mod/steamnsteel/block/machine/PipeJunctionBlock.java (version dd06cdff59dd8d510d6c8e0f60a33a576e3a33a3)
    • src/main/java/mod/steamnsteel/block/machine/PipeRedstoneValveBlock.java (version dd06cdff59dd8d510d6c8e0f60a33a576e3a33a3)
    • src/main/java/mod/steamnsteel/block/machine/PipeValveBlock.java (version dd06cdff59dd8d510d6c8e0f60a33a576e3a33a3)
    • src/main/java/mod/steamnsteel/block/resource/ore/NiterOre.java (version dd06cdff59dd8d510d6c8e0f60a33a576e3a33a3)
    • src/main/java/mod/steamnsteel/block/resource/ore/SulfurOre.java (version dd06cdff59dd8d510d6c8e0f60a33a576e3a33a3)
    • src/main/java/mod/steamnsteel/block/resource/structure/ConcreteBlock.java (version dd06cdff59dd8d510d6c8e0f60a33a576e3a33a3)
    • src/main/java/mod/steamnsteel/block/resource/structure/RemnantRuinFloorBlock.java (version dd06cdff59dd8d510d6c8e0f60a33a576e3a33a3)
    • src/main/java/mod/steamnsteel/block/resource/structure/RemnantRuinIronBarsBlock.java (version dd06cdff59dd8d510d6c8e0f60a33a576e3a33a3)
    • src/main/java/mod/steamnsteel/block/resource/structure/RemnantRuinPillarBlock.java (version dd06cdff59dd8d510d6c8e0f60a33a576e3a33a3)
    • src/main/java/mod/steamnsteel/block/resource/structure/RemnantRuinWallBlock.java (version dd06cdff59dd8d510d6c8e0f60a33a576e3a33a3)
    • src/main/java/mod/steamnsteel/block/utility/ProjectTableBlock.java (version dd06cdff59dd8d510d6c8e0f60a33a576e3a33a3)
    • src/main/java/mod/steamnsteel/client/codemodel/BaseCodeModel.java (version dd06cdff59dd8d510d6c8e0f60a33a576e3a33a3)
    • src/main/java/mod/steamnsteel/client/renderer/tileentity/LargeFanTESR.java (version dd06cdff59dd8d510d6c8e0f60a33a576e3a33a3)
    • src/main/java/mod/steamnsteel/client/renderer/tileentity/OgexStructureTESR.java (version dd06cdff59dd8d510d6c8e0f60a33a576e3a33a3)
    • src/main/java/mod/steamnsteel/client/renderer/tileentity/StructureTESR.java (version dd06cdff59dd8d510d6c8e0f60a33a576e3a33a3)
    • src/main/java/mod/steamnsteel/crafting/Recipes.java (version dd06cdff59dd8d510d6c8e0f60a33a576e3a33a3)
    • src/main/java/mod/steamnsteel/inventory/CupolaContainer.java (version dd06cdff59dd8d510d6c8e0f60a33a576e3a33a3)
    • src/main/java/mod/steamnsteel/library/Material.java (version dd06cdff59dd8d510d6c8e0f60a33a576e3a33a3)
    • src/main/java/mod/steamnsteel/library/ModBlock.java (version dd06cdff59dd8d510d6c8e0f60a33a576e3a33a3)
    • src/main/java/mod/steamnsteel/library/ModCrafting.java (version dd06cdff59dd8d510d6c8e0f60a33a576e3a33a3)
    • src/main/java/mod/steamnsteel/library/Reference.java (version dd06cdff59dd8d510d6c8e0f60a33a576e3a33a3)
    • src/main/java/mod/steamnsteel/networking/ProjectTableCraftPacketMessageHandler.java (version dd06cdff59dd8d510d6c8e0f60a33a576e3a33a3)
    • src/main/java/mod/steamnsteel/tileentity/RemnantRuinChestTE.java (version dd06cdff59dd8d510d6c8e0f60a33a576e3a33a3)
    • src/main/java/mod/steamnsteel/world/SchematicLoader.java (version dd06cdff59dd8d510d6c8e0f60a33a576e3a33a3)
    • src/main/java/mod/steamnsteel/world/WorldGen.java (version dd06cdff59dd8d510d6c8e0f60a33a576e3a33a3)
    • src/main/java/mod/steamnsteel/world/ore/SulfurOreGenerator.java (version dd06cdff59dd8d510d6c8e0f60a33a576e3a33a3)
    • src/main/java/mod/steamnsteel/world/ore/niter/NiterVeinGeneratorStateMachine.java (version dd06cdff59dd8d510d6c8e0f60a33a576e3a33a3)
    • src/main/java/mod/steamnsteel/world/ore/niter/NiterVeinGeneratorStates.java (version dd06cdff59dd8d510d6c8e0f60a33a576e3a33a3)
  • Steven Blom

    Steven Blom c526269b2fc75f8355a6d90ace0f896132ebc58e m

    Merge branch 'feature/project-table-model' into feature/1.9-Upgrade
    # Conflicts:
    #        src/main/java/mod/steamnsteel/api/CraftingManager.java
    #        src/main/java/mod/steamnsteel/block/SteamNSteelDirectionalBlock.java
    #        src/main/java/mod/steamnsteel/block/utility/ProjectTableBlock.java
    #        src/main/java/mod/steamnsteel/library/ModBlock.java

  • Steven Blom

    Steven Blom b8b765002a4be4b48dfa79cdde007e6ab14d273e m

    Fluent Crafting APIs

    • src/api/java/mod/steamnsteel/api/crafting/ICraftingAlloyFirstIngredient.java (version b8b765002a4be4b48dfa79cdde007e6ab14d273e)
    • src/api/java/mod/steamnsteel/api/crafting/ICraftingAlloyResult.java (version b8b765002a4be4b48dfa79cdde007e6ab14d273e)
    • src/api/java/mod/steamnsteel/api/crafting/ICraftingAlloySecondIngredient.java (version b8b765002a4be4b48dfa79cdde007e6ab14d273e)
    • src/api/java/mod/steamnsteel/api/crafting/ICraftingManager.java (version b8b765002a4be4b48dfa79cdde007e6ab14d273e)
    • src/api/java/mod/steamnsteel/api/crafting/ICraftingManagerIngredientOrResult.java (version b8b765002a4be4b48dfa79cdde007e6ab14d273e)
    • src/api/java/mod/steamnsteel/api/crafting/ICraftingManagerIngredients.java (version b8b765002a4be4b48dfa79cdde007e6ab14d273e)
    • src/api/java/mod/steamnsteel/api/crafting/ICraftingManagerIngredientsOrLabel.java (version b8b765002a4be4b48dfa79cdde007e6ab14d273e)
    • src/api/java/mod/steamnsteel/api/crafting/ICraftingManagerResult.java (version b8b765002a4be4b48dfa79cdde007e6ab14d273e)
    • src/api/java/mod/steamnsteel/api/crafting/IProjectTableManager.java (version b8b765002a4be4b48dfa79cdde007e6ab14d273e)
    • src/main/java/mod/steamnsteel/api/AlloyContext.java (version b8b765002a4be4b48dfa79cdde007e6ab14d273e)
    • src/main/java/mod/steamnsteel/api/CraftingManager.java (version b8b765002a4be4b48dfa79cdde007e6ab14d273e)
    • src/main/java/mod/steamnsteel/api/ProjectTableRecipeContext.java (version b8b765002a4be4b48dfa79cdde007e6ab14d273e)
    • src/main/java/mod/steamnsteel/crafting/Smelting.java (version b8b765002a4be4b48dfa79cdde007e6ab14d273e)
    • src/main/java/mod/steamnsteel/crafting/projecttable/ProjectTableManager.java (version b8b765002a4be4b48dfa79cdde007e6ab14d273e)
    • src/main/java/mod/steamnsteel/library/ModCrafting.java (version b8b765002a4be4b48dfa79cdde007e6ab14d273e)
  • Steven Blom

    Steven Blom b4fa0da7112c16d7952337aae356cb959688a046 m

    Fix some Cupola Bugs

    • src/main/java/mod/steamnsteel/block/machine/CupolaBlock.java (version b4fa0da7112c16d7952337aae356cb959688a046)
    • src/main/java/mod/steamnsteel/inventory/CupolaContainer.java (version b4fa0da7112c16d7952337aae356cb959688a046)
    • src/main/java/mod/steamnsteel/library/ModItem.java (version b4fa0da7112c16d7952337aae356cb959688a046)
  • Steven Blom

    Steven Blom f263a087a5e7c87511f80a993d08fee71f0bc4be m

    More fixes for 1.9

    • build.properties (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/TheMod.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/block/ShapeLIBlock.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/block/SteamNSteelBlock.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/block/SteamNSteelDirectionalStorageBlock.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/block/SteamNSteelStorageBlock.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/block/SteamNSteelStructureBlock.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/block/SteamNSteelStructureShapeBlock.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/block/container/RemnantRuinChestBlock.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/block/machine/CupolaBlock.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/block/machine/PipeBlock.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/block/machine/PipeJunctionBlock.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/block/machine/PipeRedstoneValveBlock.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/block/machine/PipeValveBlock.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/block/machine/structure/FanLargeStructure.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/block/machine/structure/SSBallMillStructure.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/block/machine/structure/SSBlastFurnaceStructure.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/block/machine/structure/SSBoilerStructure.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/block/resource/ore/CopperOre.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/block/resource/ore/NiterOre.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/block/resource/ore/SulfurOre.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/block/resource/ore/TinOre.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/block/resource/ore/ZincOre.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/block/resource/structure/ConcreteBlock.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/block/resource/structure/RemnantRuinFloorBlock.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/block/resource/structure/RemnantRuinIronBarsBlock.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/block/resource/structure/RemnantRuinPillarBlock.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/block/resource/structure/RemnantRuinWallBlock.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/block/utility/CraftingStationBlock.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/client/codemodel/PipeModel.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/client/gui/CupolaGui.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/client/gui/SteamNSteelGui.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/client/model/opengex/OpenGEXModel.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/client/model/opengex/OpenGEXModelInstance.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/client/model/opengex/OpenGEXModelPart.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/client/model/opengex/OpenGEXState.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/client/model/pct/PCTModel.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/client/model/pct/PCTModelInstance.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/client/model/pct/PCTModelLoader.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/configuration/ConfigurationHandler.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/configuration/Settings.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/configuration/client/ConfigGUI.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/crafting/ArmorRecipes.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/crafting/IngotRecipes.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/crafting/Smelting.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/crafting/ToolRecipes.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/item/SteamNSteelItem.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/item/armor/SSArmorBoots.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/item/armor/SSArmorChest.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/item/armor/SSArmorHelmet.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/item/armor/SSArmorLegs.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/item/armor/SteamNSteelItemArmor.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/item/artifact/AnachDoodad.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/item/artifact/MustyJournal.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/item/artifact/PerGuiVox.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/item/artifact/PlotoniumScrap.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/item/artifact/VoxBox.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/item/resource/Niter.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/item/resource/Sulfur.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/item/resource/ingot/BrassIngot.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/item/resource/ingot/BronzeIngot.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/item/resource/ingot/CopperIngot.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/item/resource/ingot/PlotoniumIngot.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/item/resource/ingot/SteelIngot.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/item/resource/ingot/TinIngot.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/item/resource/ingot/ZincIngot.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/item/tool/SSToolAxe.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/item/tool/SSToolHoe.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/item/tool/SSToolPickaxe.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/item/tool/SSToolShovel.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/item/tool/SSToolSword.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/item/tool/StructureBuild.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/library/ModBlock.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/library/ModItem.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/library/Reference.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/proxy/ClientRenderProxy.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/proxy/CommonNetworkProxy.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/texturing/wall/RemnantRuinFloorSideTexture.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/texturing/wall/RemnantRuinWallTexture.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/tileentity/CupolaTE.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/tileentity/RemnantRuinChestTE.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/tileentity/SteamNSteelTE.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/tileentity/structure/BallMillTE.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/utility/log/Logger.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/world/SchematicLoader.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/world/WorldGen.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/world/ore/RetroGenHandler.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/world/structure/RemnantRuinsGenerator.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/java/mod/steamnsteel/world/structure/remnantruins/RuinLevel.java (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/resources/assets/steamnsteel/blockstates/pipeJunction.json (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/resources/assets/steamnsteel/blockstates/remnantRuinIronBars.json (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/resources/assets/steamnsteel/models/block/SSCupola.obj (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/resources/assets/steamnsteel/models/block/bars_n.json (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/resources/assets/steamnsteel/models/block/bars_ne.json (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/resources/assets/steamnsteel/models/block/bars_ns.json (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/resources/assets/steamnsteel/models/block/bars_nse.json (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/resources/assets/steamnsteel/models/block/bars_nsew.json (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/resources/assets/steamnsteel/models/block/pipes/SSPipesBendNE.obj (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/resources/assets/steamnsteel/models/block/pipes/SSPipesBendNW.obj (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/resources/assets/steamnsteel/models/block/pipes/SSPipesBendSE.obj (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/resources/assets/steamnsteel/models/block/pipes/SSPipesBendSW.obj (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/resources/assets/steamnsteel/models/block/pipes/SSPipesCap.obj (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
    • src/main/resources/assets/steamnsteel/models/block/pipes/SSPipesStraight.obj (version f263a087a5e7c87511f80a993d08fee71f0bc4be)
  • Steven Blom

    Steven Blom 44d0c1d761672b066cf62a874a64b560c7730899 m

    Base 1.9 Port. Requires 1.9 versions of Structure and MCGui.

    • build.gradle (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • build.properties (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/api/java/mod/steamnsteel/api/plumbing/IDelegatedTileEntityBlock.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/block/SteamNSteelDirectionalBlock.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/block/SteamNSteelDirectionalStorageBlock.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/block/SteamNSteelMachineBlock.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/block/SteamNSteelOreBlock.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/block/SteamNSteelStorageBlock.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/block/SteamNSteelStructureShapeBlock.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/block/container/RemnantRuinChestBlock.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/block/machine/CupolaBlock.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/block/machine/PipeBlock.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/block/machine/PipeJunctionBlock.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/block/machine/PipeRedstoneValveBlock.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/block/machine/PipeValveBlock.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/block/machine/structure/FanLargeStructure.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/block/machine/structure/SSBallMillStructure.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/block/machine/structure/SSBlastFurnaceStructure.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/block/machine/structure/SSBoilerStructure.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/block/resource/structure/ConcreteBlock.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/block/resource/structure/RemnantRuinFloorBlock.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/block/resource/structure/RemnantRuinIronBarsBlock.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/block/resource/structure/RemnantRuinPillarBlock.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/block/resource/structure/RemnantRuinWallBlock.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/block/utility/CraftingStationBlock.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/client/codemodel/BaseCodeModel.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/client/codemodel/PipeModel.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/client/gui/ProjectTableGui.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/client/model/opengex/OpenGEXModel.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/client/model/opengex/OpenGEXModelInstance.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/client/model/pct/PCTModel.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/client/model/pct/PCTModelInstance.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/client/model/pct/PCTModelLoader.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/client/model/pct/PropertyBlockPos.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/client/renderer/tileentity/LargeFanTESR.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/client/renderer/tileentity/OgexStructureTESR.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/client/renderer/tileentity/StructureTESR.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/configuration/Settings.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/crafting/ToolRecipes.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/gui/GuiHandler.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/inventory/ProjectTableContainer.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/item/armor/SSArmorBoots.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/item/armor/SSArmorChest.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/item/armor/SSArmorHelmet.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/item/armor/SSArmorLegs.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/item/armor/SteamNSteelItemArmor.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/item/resource/structure/ConcreteBlockItem.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/library/Material.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/library/ModBlockParts.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/library/ModItem.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/proxy/ClientRenderProxy.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/texturing/api/FeatureInstance.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/texturing/api/ProceduralConnectedTexture.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/texturing/api/SpriteRequest.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/texturing/api/traitregistry/FeatureRegistry.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/texturing/feature/BottomBandWallFeature.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/texturing/feature/HorizontalMetalTearRuinWallFeature.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/texturing/feature/LongPipeRuinWallFeature.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/texturing/feature/NullFeature.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/texturing/feature/OneByOneWallFeature.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/texturing/feature/PipesRuinWallFeature.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/texturing/feature/PlateRuinWallFeature.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/texturing/feature/RepeatingTextureFeature.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/texturing/feature/TopBandWallFeature.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/texturing/feature/VerticalMetalTearRuinWallFeature.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/tileentity/BasePlumbingTE.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/tileentity/CupolaTE.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/tileentity/PipeRedstoneValveTE.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/tileentity/PipeTE.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/tileentity/PipeValveTE.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/tileentity/RemnantRuinChestTE.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/tileentity/structure/BallMillTE.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/tileentity/structure/BlastFurnaceTE.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/tileentity/structure/BoilerTE.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/utility/blockParts/BlockPart.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/utility/blockParts/BlockPartConfiguration.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/utility/blockParts/ITileEntityWithParts.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/utility/blockParts/PartSet.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/utility/position/ChunkBlockCoord.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/utility/position/ChunkCoord.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/utility/world/BlockWorldCoordPair.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/utility/world/ColumnDownwardBlockIterator.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/utility/world/WorldRaytraceIterator.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/world/LoadSchematicFromFileCommand.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/world/LoadSchematicFromResourceCommand.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/world/SchematicLoader.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/world/WorldGen.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/world/ore/NiterOreGenerator.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/world/ore/OreGenerator.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/world/ore/RetroGenHandler.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/world/ore/SulfurOreGenerator.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/world/ore/niter/ColumnMaterialDownwardIterator.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/world/ore/niter/MaterialWorldCoordPair.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/world/ore/niter/NiterVeinGeneratorStateMachine.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/java/mod/steamnsteel/world/structure/StructureChunkGenerator.java (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/resources/assets/steamnsteel/blockstates/fanLarge.json (version 44d0c1d761672b066cf62a874a64b560c7730899)
    • src/main/resources/assets/steamnsteel/blockstates/ssBallMill.json (version 44d0c1d761672b066cf62a874a64b560c7730899)
  • Steven Blom

    Steven Blom cb0268a17076e84ce543e880f445bcf2a037870d m

    Merge branch 'develop' into feature/project-table-model

  • Steven Blom

    Steven Blom 7793aea050ed5f299b4fff53eb8268d6f711207a m

    Merge branch 'develop' into feature/project-table-model
    # Conflicts:
    #        src/main/java/mod/steamnsteel/library/ModBlock.java

  • Steven Blom

    Steven Blom db22f8ac2382789045eedd1a185884bcd9aaf25a m

    Project Table Model!

    • src/main/java/mod/steamnsteel/api/CraftingManager.java (version db22f8ac2382789045eedd1a185884bcd9aaf25a)
    • src/main/java/mod/steamnsteel/block/SteamNSteelDirectionalBlock.java (version db22f8ac2382789045eedd1a185884bcd9aaf25a)
    • src/main/java/mod/steamnsteel/block/utility/CraftingStationBlock.java (version db22f8ac2382789045eedd1a185884bcd9aaf25a)
    • src/main/java/mod/steamnsteel/block/utility/ProjectTableBlock.java (version db22f8ac2382789045eedd1a185884bcd9aaf25a)
    • src/main/java/mod/steamnsteel/client/model/opengex/OpenGEXModel.java (version db22f8ac2382789045eedd1a185884bcd9aaf25a)
    • src/main/java/mod/steamnsteel/library/ModBlock.java (version db22f8ac2382789045eedd1a185884bcd9aaf25a)
    • src/main/java/mod/steamnsteel/proxy/ClientRenderProxy.java (version db22f8ac2382789045eedd1a185884bcd9aaf25a)
    • src/main/resources/assets/steamnsteel/blockstates/craftingStation.json (version db22f8ac2382789045eedd1a185884bcd9aaf25a)
    • src/main/resources/assets/steamnsteel/blockstates/projectTable.json (version db22f8ac2382789045eedd1a185884bcd9aaf25a)
    • src/main/resources/assets/steamnsteel/lang/en_US.lang (version db22f8ac2382789045eedd1a185884bcd9aaf25a)
    • src/main/resources/assets/steamnsteel/models/block/SSProjectTable.ogex (version db22f8ac2382789045eedd1a185884bcd9aaf25a)
    • src/main/resources/assets/steamnsteel/textures/models/SSProjectTable.png (version db22f8ac2382789045eedd1a185884bcd9aaf25a)
    • src/main/resources/assets/steamnsteel/textures/models/SSProjectTableBlueprintBase.png (version db22f8ac2382789045eedd1a185884bcd9aaf25a)