new logo + fixes

src/generated/resources/.cache/2d06ea55ee27bcb1f7f87fa8ec3e037afa7e1ad9

@@ -1,4 +1,4 @@
-// 1.19.2	2023-10-31T19:58:49.6604913	Registrate Provider for createindustry [Recipes, Advancements, Loot tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)]
+// 1.19.2	2023-11-01T14:33:21.8836334	Registrate Provider for createindustry [Recipes, Advancements, Loot tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)]
 50db526af77cf0ead08cadfd3f7daa8b84a40312 assets/createindustry/blockstates/air_intake.json
 429437419b2ec98bd716e7ba15583b84da7488d5 assets/createindustry/blockstates/aluminum_bars.json
 9e2417e479011e42ebf00685068e6b6f515f0b11 assets/createindustry/blockstates/aluminum_block.json
@@ -1158,8 +1158,8 @@ c93e03d746cae5143427d5605bebd2b2a4006219 data/minecraft/tags/blocks/azalea_root_
 23cf02cfaf4f4efd7feb2a328e623fc63523216b data/minecraft/tags/blocks/doors.json
 c93e03d746cae5143427d5605bebd2b2a4006219 data/minecraft/tags/blocks/dripstone_replaceable_blocks.json
 c93e03d746cae5143427d5605bebd2b2a4006219 data/minecraft/tags/blocks/lush_ground_replaceable.json
-ef4a9e560676e734df25608bbb640012bc1bf4a8 data/minecraft/tags/blocks/mineable/axe.json
+97796d300c6a1759abe459ae9175556a17a7e568 data/minecraft/tags/blocks/mineable/axe.json
-eff1ac88a5d4bad1b7bb979d6f76190d73db4efe data/minecraft/tags/blocks/mineable/pickaxe.json
+320d34c446d48da3b1c279110605bfbdefac98db data/minecraft/tags/blocks/mineable/pickaxe.json
 c93e03d746cae5143427d5605bebd2b2a4006219 data/minecraft/tags/blocks/moss_replaceable.json
 8a3dfd27452a21f14ee2a9936ddc357c3dbb9ae4 data/minecraft/tags/blocks/needs_diamond_tool.json
 c0d6e4e469f0314abef1f5221459942b0ea29558 data/minecraft/tags/blocks/needs_iron_tool.json

src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json

@@ -8,8 +8,6 @@
     "createindustry:cast_iron_flywheel",
     "createindustry:formwork_block",
     "createindustry:rebar_formwork_block",
-    "createindustry:cast_iron_distillation_output",
-    "createindustry:steel_distillation_output",
     "createindustry:machine_input",
     "createindustry:pumpjack_crank",
     "createindustry:copper_encased_steel_pipe",

src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json

@@ -24,12 +24,19 @@
     "createindustry:factory_floor_stairs",
     "createindustry:factory_floor",
     "createindustry:factory_floor_slab",
+    "createindustry:exhaust",
+    "createindustry:flarestack",
+    "createindustry:surface_scanner",
     "createindustry:steel_fluid_tank",
     "createindustry:cast_iron_distillation_output",
+    "createindustry:cast_iron_distillation_controller",
     "createindustry:steel_distillation_output",
+    "createindustry:steel_distillation_controller",
     "createindustry:industrial_pipe",
     "createindustry:machine_input",
     "createindustry:pumpjack_crank",
+    "createindustry:pumpjack_base",
+    "createindustry:pumpjack_hammer_holder",
     "createindustry:fireproof_bricks",
     "createindustry:fireproof_brick_reinforcement",
     "createindustry:blast_furnace_output",

src/main/java/com/drmangotea/createindustry/base/creative_mode_tabs/BaseTFMGCreativeModeTab.java

@@ -1,5 +1,6 @@
 package com.drmangotea.createindustry.base.creative_mode_tabs;
 
+import com.drmangotea.createindustry.registry.TFMGBlocks;
 import com.drmangotea.createindustry.registry.TFMGCreativeModeTabs;
 import com.drmangotea.createindustry.registry.TFMGItems;
 import com.simibubi.create.AllBlocks;
@@ -13,6 +14,6 @@ public class BaseTFMGCreativeModeTab extends TFMGCreativeModeTab {
 
     @Override
     public ItemStack makeIcon() {
-        return TFMGItems.ZINC_GRENADE.asStack();
+        return TFMGBlocks.GASOLINE_ENGINE.asStack();
     }
 }

src/main/java/com/drmangotea/createindustry/mixins/AllOreFeatureConfigEntriesMixin.java

@@ -36,7 +36,8 @@ public class AllOreFeatureConfigEntriesMixin {
 					.layeredDatagenExt()
 					.withLayerPattern(TFMGLayeredPatterns.BAUXITE)
 					.withLayerPattern(TFMGLayeredPatterns.LIGNITE)
-					.withLayerPattern(TFMGLayeredPatterns.GALENA)
+					.withLayerPattern(TFMGLayeredPatterns.FIRECLAY)
+					//.withLayerPattern(TFMGLayeredPatterns.GALENA)
 					.withLayerPattern(AllLayerPatterns.SCORIA)
 					.withLayerPattern(AllLayerPatterns.CINNABAR)
 					.withLayerPattern(AllLayerPatterns.MAGNETITE)

src/main/java/com/drmangotea/createindustry/registry/TFMGBlocks.java

@@ -201,6 +201,7 @@ public class TFMGBlocks {
     public static final BlockEntry<Block> CAUTION_BLOCK = REGISTRATE.block("caution_block", Block::new)
             .initialProperties(() -> Blocks.IRON_BLOCK)
             .properties(p -> p.color(MaterialColor.COLOR_YELLOW))
+            .properties(p -> p.strength(3))
             .transform(pickaxeOnly())
             .item()
             .build()
@@ -211,6 +212,7 @@ public class TFMGBlocks {
     public static final BlockEntry<Block> RED_CAUTION_BLOCK = REGISTRATE.block("red_caution_block", Block::new)
             .initialProperties(() -> Blocks.IRON_BLOCK)
             .properties(p -> p.color(MaterialColor.COLOR_RED))
+            .properties(p -> p.strength(3))
             .transform(pickaxeOnly())
             .item()
             .build()
@@ -316,13 +318,13 @@ public class TFMGBlocks {
 
 
     public static final BlockEntry<Block> FACTORY_FLOOR = withVariants("factory_floor",Blocks.STONE,
-            MaterialColor.COLOR_GRAY,"Factory Floor",BlockTags.NEEDS_STONE_TOOL,SoundType.NETHERITE_BLOCK,5,false);
+            MaterialColor.COLOR_GRAY,"Factory Floor",BlockTags.NEEDS_STONE_TOOL,SoundType.NETHERITE_BLOCK,3,false);
 
     public static final BlockEntry<SlabBlock> FACTORY_FLOOR_SLAB =  REGISTRATE.block("factory_floor_slab", SlabBlock::new)
             .initialProperties(() -> Blocks.STONE)
             .properties(p -> p.color(MaterialColor.COLOR_LIGHT_GRAY))
             .properties(p -> p.requiresCorrectToolForDrops())
-            .properties(p -> p.strength(5,5))
+            .properties(p -> p.strength(3))
             .transform(pickaxeOnly())
             .blockstate((c, p) -> TFMGVanillaBlockStates.generateSlabBlockState(c, p, "factory_floor"))
             .tag(BlockTags.NEEDS_STONE_TOOL)
@@ -377,23 +379,24 @@ public class TFMGBlocks {
     //-----------------------MACHINES---------------------------//
     public static final BlockEntry<FormWorkBlock> FORMWORK_BLOCK =
             REGISTRATE.block("formwork_block", FormWorkBlock::new)
-                    .initialProperties(Material.WOOD)
+                    .initialProperties(() -> Blocks.OAK_PLANKS)
                     .properties(p -> p.color(MaterialColor.WOOD))
                     .properties(p -> p.requiresCorrectToolForDrops())
                     .properties(BlockBehaviour.Properties::noOcclusion)
                     .blockstate(new FormWorkGenerator()::generate)
-                    .transform(axeOnly())
+                     .transform(axeOnly())
                     .item()
                     .transform(customItemModel())
                     .register();
 
     public static final BlockEntry<RebarFormWorkBlock> REBAR_FORMWORK_BLOCK =
             REGISTRATE.block("rebar_formwork_block", RebarFormWorkBlock::new)
-                    .initialProperties(Material.WOOD)
+                    .initialProperties(() -> Blocks.OAK_PLANKS)
                     .properties(p -> p.color(MaterialColor.WOOD))
                     .properties(p -> p.requiresCorrectToolForDrops())
                     .properties(BlockBehaviour.Properties::noOcclusion)
                     .blockstate(new FormWorkGenerator()::generate)
+                    .addLayer(() -> RenderType::cutoutMipped)
                     .transform(axeOnly())
                     .item()
                     .transform(customItemModel())
@@ -405,6 +408,7 @@ public class TFMGBlocks {
                     .initialProperties(SharedProperties::copperMetal)
                     .addLayer(() -> RenderType::cutoutMipped)
                     .blockstate(BlockStateGen.directionalBlockProvider(false))
+                    .transform(pickaxeOnly())
                     .item()
                     .transform(customItemModel())
                     .register();
@@ -418,6 +422,7 @@ public class TFMGBlocks {
                             .lightLevel(s -> s.getValue(FlarestackBlock.LIT) ? 15 : 0)
                             .noOcclusion())
                     .blockstate(new FlarestackGenerator()::generate)
+                    .transform(pickaxeOnly())
                     .item()
                     .transform(customItemModel())
                     .register();
@@ -431,6 +436,7 @@ public class TFMGBlocks {
                  //          .strength(4.5F))
                     //  .properties(BlockBehaviour.Properties::noOcclusion)
                     .transform(TFMGBuilderTransformers.surfaceScanner())
+                    .transform(pickaxeOnly())
                     //  .transform(axeOrPickaxe())
                   //  .transform(BlockStressDefaults.setImpact(10.0))
                     .register();
@@ -466,7 +472,7 @@ public class TFMGBlocks {
                     .properties(p -> p.color(MaterialColor.STONE))
                     .properties(BlockBehaviour.Properties::noOcclusion)
                     .blockstate((ctx, prov) -> prov.simpleBlock(ctx.getEntry(), AssetLookup.partialBaseModel(ctx, prov)))
-                    .transform(axeOrPickaxe())
+                    .transform(pickaxeOnly())
                     .item(AssemblyOperatorBlockItem::new)
                     .build()
                     .register();
@@ -474,6 +480,7 @@ public class TFMGBlocks {
             REGISTRATE.block("cast_iron_distillation_controller", DistilleryControllerBlock::new)
                     .initialProperties(SharedProperties::copperMetal)
                     .blockstate((ctx, prov) -> prov.simpleBlock(ctx.getEntry(), AssetLookup.partialBaseModel(ctx, prov)))
+                    .transform(pickaxeOnly())
                     .item()
                     .build()
                     .register();
@@ -484,7 +491,7 @@ public static final BlockEntry<DistillationOutputBlock> STEEL_DISTILLATION_OUTPU
                 .properties(p -> p.color(MaterialColor.STONE))
                 .blockstate((ctx, prov) -> prov.simpleBlock(ctx.getEntry(), AssetLookup.partialBaseModel(ctx, prov)))
                 .properties(BlockBehaviour.Properties::noOcclusion)
-                .transform(axeOrPickaxe())
+                .transform(pickaxeOnly())
                 .item(AssemblyOperatorBlockItem::new)
                 .build()
                 .register();
@@ -492,6 +499,7 @@ public static final BlockEntry<DistillationOutputBlock> STEEL_DISTILLATION_OUTPU
             REGISTRATE.block("steel_distillation_controller", DistillationControllerBlock::new)
                     .initialProperties(SharedProperties::copperMetal)
                     .blockstate((ctx, prov) -> prov.simpleBlock(ctx.getEntry(), AssetLookup.partialBaseModel(ctx, prov)))
+                    .transform(pickaxeOnly())
                     .item()
                     .build()
                     .register();
@@ -537,6 +545,7 @@ public static final BlockEntry<DistillationOutputBlock> STEEL_DISTILLATION_OUTPU
             REGISTRATE.block("pumpjack_base", PumpjackBaseBlock::new)
                     .initialProperties(SharedProperties::copperMetal)
                     .properties(BlockBehaviour.Properties::noOcclusion)
+                    .transform(pickaxeOnly())
                     .blockstate(BlockStateGen.horizontalBlockProvider(true))
                     .item()
                     .build()
@@ -547,6 +556,7 @@ public static final BlockEntry<DistillationOutputBlock> STEEL_DISTILLATION_OUTPU
                     .initialProperties(SharedProperties::copperMetal)
                     .properties(BlockBehaviour.Properties::noOcclusion)
                     .blockstate(BlockStateGen.horizontalBlockProvider(true))
+                    .transform(pickaxeOnly())
                     .item()
                     .build()
                     .register();
@@ -901,7 +911,7 @@ public static final BlockEntry<DistillationOutputBlock> STEEL_DISTILLATION_OUTPU
 
     //STEEL
     public static final BlockEntry<SteelPipeBlock> STEEL_PIPE = REGISTRATE.block("steel_pipe", SteelPipeBlock::new)
-            .initialProperties(Material.HEAVY_METAL)
+            .initialProperties(() -> Blocks.IRON_BLOCK)
             .transform(pickaxeOnly())
             .blockstate(BlockStateGen.pipe())
             .onRegister(CreateRegistrate.blockModel(() -> SteelPipeAttachmentModel::new))
@@ -983,7 +993,7 @@ public static final BlockEntry<DistillationOutputBlock> STEEL_DISTILLATION_OUTPU
             .register();
     //CAST_IRON
     public static final BlockEntry<CastIronPipeBlock> CAST_IRON_PIPE = REGISTRATE.block("cast_iron_pipe", CastIronPipeBlock::new)
-            .initialProperties(Material.HEAVY_METAL)
+            .initialProperties(() -> Blocks.IRON_BLOCK)
             .transform(pickaxeOnly())
             .blockstate(BlockStateGen.pipe())
             .onRegister(CreateRegistrate.blockModel(() -> CastIronPipeAttachmentModel::new))
@@ -1065,7 +1075,7 @@ public static final BlockEntry<DistillationOutputBlock> STEEL_DISTILLATION_OUTPU
             .register();
     //BRASS
     public static final BlockEntry<BrassPipeBlock> BRASS_PIPE = REGISTRATE.block("brass_pipe", BrassPipeBlock::new)
-            .initialProperties(Material.HEAVY_METAL)
+            .initialProperties(() -> Blocks.IRON_BLOCK)
             .transform(pickaxeOnly())
             .blockstate(BlockStateGen.pipe())
             .onRegister(CreateRegistrate.blockModel(() -> BrassPipeAttachmentModel::new))
@@ -1147,7 +1157,7 @@ public static final BlockEntry<DistillationOutputBlock> STEEL_DISTILLATION_OUTPU
             .register();
     //PLASTIC
     public static final BlockEntry<PlasticPipeBlock> PLASTIC_PIPE = REGISTRATE.block("plastic_pipe", PlasticPipeBlock::new)
-            .initialProperties(Material.HEAVY_METAL)
+            .initialProperties(() -> Blocks.QUARTZ_BLOCK)
             .transform(pickaxeOnly())
             .blockstate(BlockStateGen.pipe())
             .onRegister(CreateRegistrate.blockModel(() -> PlasticPipeAttachmentModel::new))
@@ -1229,7 +1239,7 @@ public static final BlockEntry<DistillationOutputBlock> STEEL_DISTILLATION_OUTPU
             .register();
     //ALUMINUM
     public static final BlockEntry<AluminumPipeBlock> ALUMINUM_PIPE = REGISTRATE.block("aluminum_pipe", AluminumPipeBlock::new)
-            .initialProperties(Material.HEAVY_METAL)
+            .initialProperties(() -> Blocks.IRON_BLOCK)
             .transform(pickaxeOnly())
             .blockstate(BlockStateGen.pipe())
             .onRegister(CreateRegistrate.blockModel(() -> AluminumPipeAttachmentModel::new))

src/main/java/com/drmangotea/createindustry/worldgen/TFMGLayeredPatterns.java

@@ -28,23 +28,23 @@ public class TFMGLayeredPatterns {
 					.block(AllPaletteStoneTypes.ANDESITE.getBaseBlock()))
 			.build();
 
-	public static final NonNullSupplier<LayerPattern>
+	//public static final NonNullSupplier<LayerPattern>
-
+//
-			GALENA = () -> LayerPattern.builder()
+	//		GALENA = () -> LayerPattern.builder()
-			.layer(l -> l.weight(1)
+	//		.layer(l -> l.weight(1)
-					.passiveBlock())
+	//				.passiveBlock())
-			.layer(l -> l.weight(2)
+	//		.layer(l -> l.weight(2)
-					.block(TFMGBlocks.CONCRETE.get())
+	//				.block(TFMGBlocks.CONCRETE.get())
-					.size(1, 3))
+	//				.size(1, 3))
-			.layer(l -> l.weight(1)
+	//		.layer(l -> l.weight(1)
-					.block(Blocks.SMOOTH_BASALT)
+	//				.block(Blocks.SMOOTH_BASALT)
-					.block(Blocks.GRANITE)
+	//				.block(Blocks.GRANITE)
-					.size(2, 2))
+	//				.size(2, 2))
-			.layer(l -> l.weight(1)
+	//		.layer(l -> l.weight(1)
-					.blocks(Blocks.GRANITE, Blocks.SMOOTH_BASALT))
+	//				.blocks(Blocks.GRANITE, Blocks.SMOOTH_BASALT))
-			.layer(l -> l.weight(1)
+	//		.layer(l -> l.weight(1)
-					.block(AllPaletteStoneTypes.ANDESITE.getBaseBlock()))
+	//				.block(AllPaletteStoneTypes.ANDESITE.getBaseBlock()))
-			.build();
+	//		.build();
 
 	public static final NonNullSupplier<LayerPattern>
 
@@ -52,7 +52,7 @@ public class TFMGLayeredPatterns {
 			.layer(l -> l.weight(1)
 					.passiveBlock())
 			.layer(l -> l.weight(2)
-					.block(TFMGBlocks.CONCRETE.get())
+					.block(TFMGBlocks.LIGNITE.get())
 					.size(1, 3))
 			.layer(l -> l.weight(1)
 					.block(Blocks.TUFF)
@@ -65,6 +65,22 @@ public class TFMGLayeredPatterns {
 			.build();
 
 
+	public static final NonNullSupplier<LayerPattern>
+
+			FIRECLAY = () -> LayerPattern.builder()
+			.layer(l -> l.weight(2)
+					.passiveBlock())
+			.layer(l -> l.weight(2)
+					.block(TFMGBlocks.FIRECLAY.get())
+					.size(1, 2))
+			.layer(l -> l.weight(2)
+					.block(Blocks.SAND)
+					.block(Blocks.GRAVEL)
+					.size(1, 3))
+			.layer(l -> l.weight(1)
+					.block(AllPaletteStoneTypes.CRIMSITE.getBaseBlock()))
+			.build();
+
 	public static final NonNullSupplier<LayerPattern>
 
 			SULFUR = () -> LayerPattern.builder()
@@ -72,7 +88,7 @@ public class TFMGLayeredPatterns {
 			.layer(l -> l.weight(2)
 					.passiveBlock())
 			.layer(l -> l.weight(2)
-					.block(TFMGBlocks.CONCRETE.get())
+					.block(TFMGBlocks.SULFUR.get())
 					.size(1, 2))
 			.layer(l -> l.weight(3)
 					.block(AllPaletteStoneTypes.SCORCHIA.getBaseBlock())
@@ -85,6 +101,26 @@ public class TFMGLayeredPatterns {
 					.block(Blocks.SMOOTH_BASALT))
 			.build();
 
+	public static final NonNullSupplier<LayerPattern>
+
+			FIRECLAY_NETHER = () -> LayerPattern.builder()
+			.inNether()
+			.layer(l -> l.weight(2)
+					.passiveBlock())
+			.layer(l -> l.weight(2)
+					.block(TFMGBlocks.FIRECLAY.get())
+					.size(1, 2))
+			.layer(l -> l.weight(3)
+					.block(AllPaletteStoneTypes.SCORCHIA.getBaseBlock())
+					.block(Blocks.GRAVEL)
+					.size(1, 3))
+			.layer(l -> l.weight(1)
+					.block(Blocks.MAGMA_BLOCK))
+			.layer(l -> l.weight(2)
+					.block(Blocks.SOUL_SOIL)
+					.block(Blocks.SOUL_SAND))
+			.build();
+
 
 
 

src/main/resources/META-INF/mods.toml

@@ -8,13 +8,13 @@ license="MIT"
 
 modId="createindustry"
 
-version="${file.jarVersion}"
+version="0.6.0"
 
 displayName="Create: The Factory Must Grow"
 
 logoFile="logo.png"
 
-authors="DrMangoTea, Pepa, Milky"
+authors="DrMangoTea, Pepa, Milky, Luna"
 
 description='''
 description soon

src/main/resources/assets/createindustry/models/block/flarestack/block.json

@@ -3,7 +3,7 @@
 	"parent": "minecraft:block/block",
 	"textures": {
 		"0": "createindustry:block/flarestack",
-		"particle": "minecraft:block/anvil"
+		"particle": "block/anvil"
 	},
 	"elements": [
 		{
@@ -15,7 +15,6 @@
 				"east": {"uv": [7, 0, 12, 6], "texture": "#0"},
 				"south": {"uv": [7, 0, 12, 6], "texture": "#0"},
 				"west": {"uv": [7, 0, 12, 6], "texture": "#0"},
-				"up": {"uv": [5, 2.5, 5, 2.5], "texture": "#0"},
 				"down": {"uv": [10.5, 9, 10.5, 15], "texture": "#0"}
 			}
 		},

src/main/resources/assets/createindustry/models/block/flarestack/block_lit.json

@@ -3,7 +3,7 @@
 	"parent": "minecraft:block/block",
 	"textures": {
 		"0": "createindustry:block/flarestack",
-		"3": "minecraft:block/campfire_fire",
+		"3": "block/campfire_fire",
 		"particle": "block/anvil"
 	},
 	"elements": [
@@ -88,7 +88,6 @@
 				"east": {"uv": [7, 0, 12, 6], "texture": "#0"},
 				"south": {"uv": [7, 0, 12, 6], "texture": "#0"},
 				"west": {"uv": [7, 0, 12, 6], "texture": "#0"},
-				"up": {"uv": [5, 2.5, 5, 2.5], "texture": "#0"},
 				"down": {"uv": [10.5, 9, 10.5, 15], "texture": "#0"}
 			}
 		},

src/main/resources/assets/createindustry/models/block/flarestack/item.json

@@ -3,7 +3,7 @@
 	"parent": "minecraft:block/block",
 	"textures": {
 		"0": "createindustry:block/flarestack",
-		"particle": "minecraft:block/anvil"
+		"particle": "block/anvil"
 	},
 	"elements": [
 		{
@@ -15,7 +15,6 @@
 				"east": {"uv": [7, 0, 12, 6], "texture": "#0"},
 				"south": {"uv": [7, 0, 12, 6], "texture": "#0"},
 				"west": {"uv": [7, 0, 12, 6], "texture": "#0"},
-				"up": {"uv": [5, 2.5, 5, 2.5], "texture": "#0"},
 				"down": {"uv": [10.5, 9, 10.5, 15], "texture": "#0"}
 			}
 		},

src/main/resources/assets/createindustry/models/block/steel_fluid_tank/block_bottom.json

@@ -5,7 +5,7 @@
 		"0": "createindustry:block/steel_fluid_tank_top",
 		"1": "createindustry:block/steel_fluid_tank",
 		"4": "createindustry:block/steel_fluid_tank_inner",
-		"particle": "createindustry:block/fluid_tank"
+		"particle": "createindustry:block/steel_fluid_tank"
 	},
 	"elements": [
 		{

src/main/resources/assets/createindustry/models/block/steel_fluid_tank/block_bottom_window.json

@@ -16,7 +16,7 @@
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]},
 			"faces": {
 				"north": {"uv": [12, 0, 16, 12], "texture": "#1", "cullface": "north"},
-				"east": {"uv": [0, 0, 1, 12], "texture": "#1", "cullface": "north"},
+				"east": {"uv": [12, 0, 13, 12], "texture": "#1", "cullface": "north"},
 				"south": {"uv": [0, 0, 4, 12], "texture": "#1", "cullface": "north"}
 			}
 		},
@@ -26,7 +26,7 @@
 			"to": [16, 16, 4],
 			"faces": {
 				"east": {"uv": [12, 0, 16, 12], "texture": "#1", "cullface": "east"},
-				"south": {"uv": [0, 0, 1, 12], "texture": "#1", "cullface": "east"},
+				"south": {"uv": [12, 0, 13, 12], "texture": "#1", "cullface": "east"},
 				"west": {"uv": [0, 0, 4, 12], "texture": "#1", "cullface": "east"}
 			}
 		},
@@ -37,7 +37,7 @@
 			"faces": {
 				"north": {"uv": [0, 0, 4, 12], "texture": "#1", "cullface": "south"},
 				"south": {"uv": [12, 0, 16, 12], "texture": "#1", "cullface": "south"},
-				"west": {"uv": [0, 0, 1, 12], "texture": "#1", "cullface": "south"}
+				"west": {"uv": [12, 0, 13, 12], "texture": "#1", "cullface": "south"}
 			}
 		},
 		{
@@ -45,15 +45,15 @@
 			"from": [0, 4, 12],
 			"to": [1, 16, 16],
 			"faces": {
-				"north": {"uv": [0, 0, 1, 12], "texture": "#1", "cullface": "west"},
+				"north": {"uv": [12, 0, 13, 12], "texture": "#1", "cullface": "west"},
 				"east": {"uv": [0, 0, 4, 12], "texture": "#1", "cullface": "west"},
 				"west": {"uv": [12, 0, 16, 12], "texture": "#1", "cullface": "west"}
 			}
 		},
 		{
 			"name": "Window",
-			"from": [4, 4, 0.95],
+			"from": [4, 4, 1],
-			"to": [12, 16, 0.95],
+			"to": [12, 16, 1],
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]},
 			"faces": {
 				"north": {"uv": [0, 4, 8, 16], "texture": "#3", "cullface": "north"},
@@ -62,8 +62,8 @@
 		},
 		{
 			"name": "Window",
-			"from": [15.05, 4, 4],
+			"from": [15, 4, 4],
-			"to": [15.05, 16, 12],
+			"to": [15, 16, 12],
 			"faces": {
 				"east": {"uv": [0, 4, 8, 16], "texture": "#3", "cullface": "east"},
 				"west": {"uv": [0, 4, 8, 16], "texture": "#3", "cullface": "east"}
@@ -71,8 +71,8 @@
 		},
 		{
 			"name": "Window",
-			"from": [4, 4, 15.05],
+			"from": [4, 4, 15],
-			"to": [12, 16, 15.05],
+			"to": [12, 16, 15],
 			"faces": {
 				"north": {"uv": [0, 4, 8, 16], "texture": "#3", "cullface": "south"},
 				"south": {"uv": [0, 4, 8, 16], "texture": "#3", "cullface": "south"}
@@ -80,8 +80,8 @@
 		},
 		{
 			"name": "Window",
-			"from": [0.95, 4, 4],
+			"from": [1, 4, 4],
-			"to": [0.95, 16, 12],
+			"to": [1, 16, 12],
 			"faces": {
 				"east": {"uv": [0, 4, 8, 16], "texture": "#3", "cullface": "west"},
 				"west": {"uv": [0, 4, 8, 16], "texture": "#3", "cullface": "west"}
@@ -95,7 +95,7 @@
 			"faces": {
 				"north": {"uv": [0, 0, 4, 12], "texture": "#1", "cullface": "north"},
 				"south": {"uv": [12, 0, 16, 12], "texture": "#1", "cullface": "north"},
-				"west": {"uv": [15, 0, 16, 12], "texture": "#1", "cullface": "north"}
+				"west": {"uv": [3, 0, 4, 12], "texture": "#1", "cullface": "north"}
 			}
 		},
 		{
@@ -103,7 +103,7 @@
 			"from": [15, 4, 12],
 			"to": [16, 16, 16],
 			"faces": {
-				"north": {"uv": [15, 0, 16, 12], "texture": "#1", "cullface": "east"},
+				"north": {"uv": [3, 0, 4, 12], "texture": "#1", "cullface": "east"},
 				"east": {"uv": [0, 0, 4, 12], "texture": "#1", "cullface": "east"},
 				"west": {"uv": [12, 0, 16, 12], "texture": "#1", "cullface": "east"}
 			}
@@ -114,7 +114,7 @@
 			"to": [4, 16, 16],
 			"faces": {
 				"north": {"uv": [12, 0, 16, 12], "texture": "#1", "cullface": "south"},
-				"east": {"uv": [15, 0, 16, 12], "texture": "#1", "cullface": "south"},
+				"east": {"uv": [3, 0, 4, 12], "texture": "#1", "cullface": "south"},
 				"south": {"uv": [0, 0, 4, 12], "texture": "#1", "cullface": "south"}
 			}
 		},
@@ -124,7 +124,7 @@
 			"to": [1, 16, 4],
 			"faces": {
 				"east": {"uv": [12, 0, 16, 12], "texture": "#1", "cullface": "west"},
-				"south": {"uv": [15, 0, 16, 12], "texture": "#1", "cullface": "west"},
+				"south": {"uv": [3, 0, 4, 12], "texture": "#1", "cullface": "west"},
 				"west": {"uv": [0, 0, 4, 12], "texture": "#1", "cullface": "west"}
 			}
 		},

src/main/resources/assets/createindustry/models/block/steel_fluid_tank/block_bottom_window_ne.json

@@ -15,14 +15,14 @@
 			"to": [16, 16, 12],
 			"faces": {
 				"east": {"uv": [4, 0, 16, 12], "texture": "#1"},
-				"south": {"uv": [4, 0, 5, 12], "texture": "#1"},
+				"south": {"uv": [12, 0, 13, 12], "texture": "#1"},
 				"west": {"uv": [0, 0, 12, 12], "texture": "#1"}
 			}
 		},
 		{
 			"name": "Window",
-			"from": [0, 4, 0.95],
+			"from": [0, 4, 1],
-			"to": [4, 16, 0.95],
+			"to": [4, 16, 1],
 			"faces": {
 				"north": {"uv": [0, 4, 4, 16], "texture": "#3"},
 				"south": {"uv": [4, 4, 8, 16], "texture": "#3"}
@@ -30,8 +30,8 @@
 		},
 		{
 			"name": "Window",
-			"from": [15.05, 4, 12],
+			"from": [15, 4, 12],
-			"to": [15.05, 16, 16],
+			"to": [15, 16, 16],
 			"faces": {
 				"east": {"uv": [4, 4, 8, 16], "texture": "#3"},
 				"west": {"uv": [0, 4, 4, 16], "texture": "#3"}
@@ -44,7 +44,7 @@
 			"faces": {
 				"north": {"uv": [0, 0, 12, 12], "texture": "#1"},
 				"south": {"uv": [4, 0, 16, 12], "texture": "#1"},
-				"west": {"uv": [11, 0, 12, 12], "texture": "#1"}
+				"west": {"uv": [3, 0, 4, 12], "texture": "#1"}
 			}
 		},
 		{

src/main/resources/assets/createindustry/models/block/steel_fluid_tank/block_bottom_window_nw.json

@@ -15,14 +15,14 @@
 			"to": [12, 16, 1],
 			"faces": {
 				"north": {"uv": [4, 0, 16, 12], "texture": "#1"},
-				"east": {"uv": [4, 0, 5, 12], "texture": "#1"},
+				"east": {"uv": [12, 0, 13, 12], "texture": "#1"},
 				"south": {"uv": [0, 0, 12, 12], "texture": "#1"}
 			}
 		},
 		{
 			"name": "Window",
-			"from": [0.95, 4, 12],
+			"from": [1, 4, 12],
-			"to": [0.95, 16, 16],
+			"to": [1, 16, 16],
 			"faces": {
 				"east": {"uv": [4, 4, 8, 16], "texture": "#3"},
 				"west": {"uv": [0, 4, 4, 16], "texture": "#3"}
@@ -30,8 +30,8 @@
 		},
 		{
 			"name": "Window",
-			"from": [12, 4, 0.95],
+			"from": [12, 4, 1],
-			"to": [16, 16, 0.95],
+			"to": [16, 16, 1],
 			"faces": {
 				"north": {"uv": [4, 4, 8, 16], "texture": "#3"},
 				"south": {"uv": [0, 4, 4, 16], "texture": "#3"}
@@ -43,7 +43,7 @@
 			"to": [1, 16, 12],
 			"faces": {
 				"east": {"uv": [4, 0, 16, 12], "texture": "#1"},
-				"south": {"uv": [11, 0, 12, 12], "texture": "#1"},
+				"south": {"uv": [3, 0, 4, 12], "texture": "#1"},
 				"west": {"uv": [0, 0, 12, 12], "texture": "#1"}
 			}
 		},

src/main/resources/assets/createindustry/models/block/steel_fluid_tank/block_bottom_window_se.json

@@ -16,13 +16,13 @@
 			"faces": {
 				"north": {"uv": [0, 0, 12, 12], "texture": "#1"},
 				"south": {"uv": [4, 0, 16, 12], "texture": "#1"},
-				"west": {"uv": [4, 0, 5, 12], "texture": "#1"}
+				"west": {"uv": [12, 0, 13, 12], "texture": "#1"}
 			}
 		},
 		{
 			"name": "Window",
-			"from": [15.05, 4, 0],
+			"from": [15, 4, 0],
-			"to": [15.05, 16, 4],
+			"to": [15, 16, 4],
 			"faces": {
 				"east": {"uv": [0, 4, 4, 16], "texture": "#3"},
 				"west": {"uv": [4, 4, 8, 16], "texture": "#3"}
@@ -30,8 +30,8 @@
 		},
 		{
 			"name": "Window",
-			"from": [0, 4, 15.05],
+			"from": [0, 4, 15],
-			"to": [4, 16, 15.05],
+			"to": [4, 16, 15],
 			"faces": {
 				"north": {"uv": [0, 4, 4, 16], "texture": "#3"},
 				"south": {"uv": [4, 4, 8, 16], "texture": "#3"}
@@ -42,7 +42,7 @@
 			"from": [15, 4, 4],
 			"to": [16, 16, 16],
 			"faces": {
-				"north": {"uv": [11, 0, 12, 12], "texture": "#1"},
+				"north": {"uv": [3, 0, 4, 12], "texture": "#1"},
 				"east": {"uv": [0, 0, 12, 12], "texture": "#1"},
 				"west": {"uv": [4, 0, 16, 12], "texture": "#1"}
 			}

src/main/resources/assets/createindustry/models/block/steel_fluid_tank/block_bottom_window_sw.json

@@ -14,15 +14,15 @@
 			"from": [0, 4, 4],
 			"to": [1, 16, 16],
 			"faces": {
-				"north": {"uv": [4, 0, 5, 12], "texture": "#1"},
+				"north": {"uv": [12, 0, 13, 12], "texture": "#1"},
 				"east": {"uv": [0, 0, 12, 12], "texture": "#1"},
 				"west": {"uv": [4, 0, 16, 12], "texture": "#1"}
 			}
 		},
 		{
 			"name": "Window",
-			"from": [12, 4, 15.05],
+			"from": [12, 4, 15],
-			"to": [16, 16, 15.05],
+			"to": [16, 16, 15],
 			"faces": {
 				"north": {"uv": [4, 4, 8, 16], "texture": "#3"},
 				"south": {"uv": [0, 4, 4, 16], "texture": "#3"}
@@ -30,8 +30,8 @@
 		},
 		{
 			"name": "Window",
-			"from": [0.95, 4, 0],
+			"from": [1, 4, 0],
-			"to": [0.95, 16, 4],
+			"to": [1, 16, 4],
 			"faces": {
 				"east": {"uv": [0, 4, 4, 16], "texture": "#3"},
 				"west": {"uv": [4, 4, 8, 16], "texture": "#3"}
@@ -43,7 +43,7 @@
 			"to": [12, 16, 16],
 			"faces": {
 				"north": {"uv": [4, 0, 16, 12], "texture": "#1"},
-				"east": {"uv": [11, 0, 12, 12], "texture": "#1"},
+				"east": {"uv": [3, 0, 4, 12], "texture": "#1"},
 				"south": {"uv": [0, 0, 12, 12], "texture": "#1"}
 			}
 		},

src/main/resources/assets/createindustry/models/block/steel_fluid_tank/block_middle_window.json

@@ -3,8 +3,8 @@
 	"parent": "block/block",
 	"textures": {
 		"1": "createindustry:block/steel_fluid_tank",
-		"3": "createindustry:block/fluid_tank_window",
+		"3": "createindustry:block/steel_fluid_tank_window",
-		"particle": "createindustry:block/fluid_tank"
+		"particle": "createindustry:block/steel_fluid_tank"
 	},
 	"elements": [
 		{
@@ -14,7 +14,7 @@
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]},
 			"faces": {
 				"north": {"uv": [12, 0, 16, 16], "texture": "#1", "cullface": "north"},
-				"east": {"uv": [0, 0, 1, 16], "texture": "#1", "cullface": "north"},
+				"east": {"uv": [12, 0, 13, 16], "texture": "#1", "cullface": "north"},
 				"south": {"uv": [0, 0, 4, 16], "texture": "#1", "cullface": "north"}
 			}
 		},
@@ -24,7 +24,7 @@
 			"to": [16, 16, 4],
 			"faces": {
 				"east": {"uv": [12, 0, 16, 16], "texture": "#1", "cullface": "east"},
-				"south": {"uv": [0, 0, 1, 16], "texture": "#1", "cullface": "east"},
+				"south": {"uv": [12, 0, 13, 16], "texture": "#1", "cullface": "east"},
 				"west": {"uv": [0, 0, 4, 16], "texture": "#1", "cullface": "east"}
 			}
 		},
@@ -35,7 +35,7 @@
 			"faces": {
 				"north": {"uv": [0, 0, 4, 16], "texture": "#1", "cullface": "south"},
 				"south": {"uv": [12, 0, 16, 16], "texture": "#1", "cullface": "south"},
-				"west": {"uv": [0, 0, 1, 16], "texture": "#1", "cullface": "south"}
+				"west": {"uv": [12, 0, 13, 16], "texture": "#1", "cullface": "south"}
 			}
 		},
 		{
@@ -43,15 +43,15 @@
 			"from": [0, 0, 12],
 			"to": [1, 16, 16],
 			"faces": {
-				"north": {"uv": [0, 0, 1, 16], "texture": "#1", "cullface": "west"},
+				"north": {"uv": [12, 0, 13, 16], "texture": "#1", "cullface": "west"},
 				"east": {"uv": [0, 0, 4, 16], "texture": "#1", "cullface": "west"},
 				"west": {"uv": [12, 0, 16, 16], "texture": "#1", "cullface": "west"}
 			}
 		},
 		{
 			"name": "Window",
-			"from": [4, 0, 0.95],
+			"from": [4, 0, 1],
-			"to": [12, 16, 0.95],
+			"to": [12, 16, 1],
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]},
 			"faces": {
 				"north": {"uv": [8, 0, 16, 16], "texture": "#3", "cullface": "north"},
@@ -60,8 +60,8 @@
 		},
 		{
 			"name": "Window",
-			"from": [15.05, 0, 4],
+			"from": [15, 0, 4],
-			"to": [15.05, 16, 12],
+			"to": [15, 16, 12],
 			"faces": {
 				"east": {"uv": [8, 0, 16, 16], "texture": "#3", "cullface": "east"},
 				"west": {"uv": [8, 0, 16, 16], "texture": "#3", "cullface": "east"}
@@ -69,8 +69,8 @@
 		},
 		{
 			"name": "Window",
-			"from": [4, 0, 15.05],
+			"from": [4, 0, 15],
-			"to": [12, 16, 15.05],
+			"to": [12, 16, 15],
 			"faces": {
 				"north": {"uv": [8, 0, 16, 16], "texture": "#3", "cullface": "south"},
 				"south": {"uv": [8, 0, 16, 16], "texture": "#3", "cullface": "south"}
@@ -78,8 +78,8 @@
 		},
 		{
 			"name": "Window",
-			"from": [0.95, 0, 4],
+			"from": [1, 0, 4],
-			"to": [0.95, 16, 12],
+			"to": [1, 16, 12],
 			"faces": {
 				"east": {"uv": [8, 0, 16, 16], "texture": "#3", "cullface": "west"},
 				"west": {"uv": [8, 0, 16, 16], "texture": "#3", "cullface": "west"}
@@ -93,7 +93,7 @@
 			"faces": {
 				"north": {"uv": [0, 0, 4, 16], "texture": "#1", "cullface": "north"},
 				"south": {"uv": [12, 0, 16, 16], "texture": "#1", "cullface": "north"},
-				"west": {"uv": [15, 0, 16, 16], "texture": "#1", "cullface": "north"}
+				"west": {"uv": [3, 0, 4, 16], "texture": "#1", "cullface": "north"}
 			}
 		},
 		{
@@ -101,7 +101,7 @@
 			"from": [15, 0, 12],
 			"to": [16, 16, 16],
 			"faces": {
-				"north": {"uv": [15, 0, 16, 16], "texture": "#1", "cullface": "east"},
+				"north": {"uv": [3, 0, 4, 16], "texture": "#1", "cullface": "east"},
 				"east": {"uv": [0, 0, 4, 16], "texture": "#1", "cullface": "east"},
 				"west": {"uv": [12, 0, 16, 16], "texture": "#1", "cullface": "east"}
 			}
@@ -112,7 +112,7 @@
 			"to": [4, 16, 16],
 			"faces": {
 				"north": {"uv": [12, 0, 16, 16], "texture": "#1", "cullface": "south"},
-				"east": {"uv": [15, 0, 16, 16], "texture": "#1", "cullface": "south"},
+				"east": {"uv": [3, 0, 4, 16], "texture": "#1", "cullface": "south"},
 				"south": {"uv": [0, 0, 4, 16], "texture": "#1", "cullface": "south"}
 			}
 		},
@@ -122,7 +122,7 @@
 			"to": [1, 16, 4],
 			"faces": {
 				"east": {"uv": [12, 0, 16, 16], "texture": "#1", "cullface": "west"},
-				"south": {"uv": [15, 0, 16, 16], "texture": "#1", "cullface": "west"},
+				"south": {"uv": [3, 0, 4, 16], "texture": "#1", "cullface": "west"},
 				"west": {"uv": [0, 0, 4, 16], "texture": "#1", "cullface": "west"}
 			}
 		}
@@ -131,7 +131,6 @@
 		{
 			"name": "tank",
 			"origin": [8, 8, -23],
-			"color": 0,
 			"children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]
 		}
 	]

src/main/resources/assets/createindustry/models/block/steel_fluid_tank/block_middle_window_ne.json

@@ -13,14 +13,14 @@
 			"to": [16, 16, 12],
 			"faces": {
 				"east": {"uv": [4, 0, 16, 16], "texture": "#1"},
-				"south": {"uv": [4, 0, 5, 16], "texture": "#1"},
+				"south": {"uv": [12, 0, 13, 16], "texture": "#1"},
 				"west": {"uv": [0, 0, 12, 16], "texture": "#1"}
 			}
 		},
 		{
 			"name": "Window",
-			"from": [0, 0, 0.95],
+			"from": [0, 0, 1],
-			"to": [4, 16, 0.95],
+			"to": [4, 16, 1],
 			"faces": {
 				"north": {"uv": [8, 0, 12, 16], "texture": "#3"},
 				"south": {"uv": [12, 0, 16, 16], "texture": "#3"}
@@ -28,8 +28,8 @@
 		},
 		{
 			"name": "Window",
-			"from": [15.05, 0, 12],
+			"from": [15, 0, 12],
-			"to": [15.05, 16, 16],
+			"to": [15, 16, 16],
 			"faces": {
 				"east": {"uv": [12, 0, 16, 16], "texture": "#3"},
 				"west": {"uv": [8, 0, 12, 16], "texture": "#3"}
@@ -42,7 +42,7 @@
 			"faces": {
 				"north": {"uv": [0, 0, 12, 16], "texture": "#1"},
 				"south": {"uv": [4, 0, 16, 16], "texture": "#1"},
-				"west": {"uv": [11, 0, 12, 16], "texture": "#1"}
+				"west": {"uv": [3, 0, 4, 16], "texture": "#1"}
 			}
 		}
 	],
@@ -50,7 +50,6 @@
 		{
 			"name": "tank",
 			"origin": [8, 8, -23],
-			"color": 0,
 			"children": [0, 1, 2, 3]
 		}
 	]

src/main/resources/assets/createindustry/models/block/steel_fluid_tank/block_middle_window_nw.json

@@ -13,14 +13,14 @@
 			"to": [12, 16, 1],
 			"faces": {
 				"north": {"uv": [4, 0, 16, 16], "texture": "#1"},
-				"east": {"uv": [4, 0, 5, 16], "texture": "#1"},
+				"east": {"uv": [12, 0, 13, 16], "texture": "#1"},
 				"south": {"uv": [0, 0, 12, 16], "texture": "#1"}
 			}
 		},
 		{
 			"name": "Window",
-			"from": [0.95, 0, 12],
+			"from": [1, 0, 12],
-			"to": [0.95, 16, 16],
+			"to": [1, 16, 16],
 			"faces": {
 				"east": {"uv": [12, 0, 16, 16], "texture": "#3"},
 				"west": {"uv": [8, 0, 12, 16], "texture": "#3"}
@@ -28,8 +28,8 @@
 		},
 		{
 			"name": "Window",
-			"from": [12, 0, 0.95],
+			"from": [12, 0, 1],
-			"to": [16, 16, 0.95],
+			"to": [16, 16, 1],
 			"faces": {
 				"north": {"uv": [12, 0, 16, 16], "texture": "#3"},
 				"south": {"uv": [8, 0, 12, 16], "texture": "#3"}
@@ -41,7 +41,7 @@
 			"to": [1, 16, 12],
 			"faces": {
 				"east": {"uv": [4, 0, 16, 16], "texture": "#1"},
-				"south": {"uv": [11, 0, 12, 16], "texture": "#1"},
+				"south": {"uv": [3, 0, 4, 16], "texture": "#1"},
 				"west": {"uv": [0, 0, 12, 16], "texture": "#1"}
 			}
 		}
@@ -50,7 +50,6 @@
 		{
 			"name": "tank",
 			"origin": [8, 8, -23],
-			"color": 0,
 			"children": [0, 1, 2, 3]
 		}
 	]

src/main/resources/assets/createindustry/models/block/steel_fluid_tank/block_middle_window_se.json

@@ -14,13 +14,13 @@
 			"faces": {
 				"north": {"uv": [0, 0, 12, 16], "texture": "#1"},
 				"south": {"uv": [4, 0, 16, 16], "texture": "#1"},
-				"west": {"uv": [4, 0, 5, 16], "texture": "#1"}
+				"west": {"uv": [12, 0, 13, 16], "texture": "#1"}
 			}
 		},
 		{
 			"name": "Window",
-			"from": [15.05, 0, 0],
+			"from": [15, 0, 0],
-			"to": [15.05, 16, 4],
+			"to": [15, 16, 4],
 			"faces": {
 				"east": {"uv": [8, 0, 12, 16], "texture": "#3"},
 				"west": {"uv": [12, 0, 16, 16], "texture": "#3"}
@@ -28,8 +28,8 @@
 		},
 		{
 			"name": "Window",
-			"from": [0, 0, 15.05],
+			"from": [0, 0, 15],
-			"to": [4, 16, 15.05],
+			"to": [4, 16, 15],
 			"faces": {
 				"north": {"uv": [8, 0, 12, 16], "texture": "#3"},
 				"south": {"uv": [12, 0, 16, 16], "texture": "#3"}
@@ -40,7 +40,7 @@
 			"from": [15, 0, 4],
 			"to": [16, 16, 16],
 			"faces": {
-				"north": {"uv": [11, 0, 12, 16], "texture": "#1"},
+				"north": {"uv": [3, 0, 4, 16], "texture": "#1"},
 				"east": {"uv": [0, 0, 12, 16], "texture": "#1"},
 				"west": {"uv": [4, 0, 16, 16], "texture": "#1"}
 			}
@@ -50,7 +50,6 @@
 		{
 			"name": "tank",
 			"origin": [8, 8, -23],
-			"color": 0,
 			"children": [0, 1, 2, 3]
 		}
 	]

src/main/resources/assets/createindustry/models/block/steel_fluid_tank/block_middle_window_sw.json

@@ -12,15 +12,15 @@
 			"from": [0, 0, 4],
 			"to": [1, 16, 16],
 			"faces": {
-				"north": {"uv": [4, 0, 5, 16], "texture": "#1"},
+				"north": {"uv": [12, 0, 13, 16], "texture": "#1"},
 				"east": {"uv": [0, 0, 12, 16], "texture": "#1"},
 				"west": {"uv": [4, 0, 16, 16], "texture": "#1"}
 			}
 		},
 		{
 			"name": "Window",
-			"from": [12, 0, 15.05],
+			"from": [12, 0, 15],
-			"to": [16, 16, 15.05],
+			"to": [16, 16, 15],
 			"faces": {
 				"north": {"uv": [12, 0, 16, 16], "texture": "#3"},
 				"south": {"uv": [8, 0, 12, 16], "texture": "#3"}
@@ -28,8 +28,8 @@
 		},
 		{
 			"name": "Window",
-			"from": [0.95, 0, 0],
+			"from": [1, 0, 0],
-			"to": [0.95, 16, 4],
+			"to": [1, 16, 4],
 			"faces": {
 				"east": {"uv": [8, 0, 12, 16], "texture": "#3"},
 				"west": {"uv": [12, 0, 16, 16], "texture": "#3"}
@@ -41,7 +41,7 @@
 			"to": [12, 16, 16],
 			"faces": {
 				"north": {"uv": [4, 0, 16, 16], "texture": "#1"},
-				"east": {"uv": [11, 0, 12, 16], "texture": "#1"},
+				"east": {"uv": [3, 0, 4, 16], "texture": "#1"},
 				"south": {"uv": [0, 0, 12, 16], "texture": "#1"}
 			}
 		}
@@ -50,7 +50,6 @@
 		{
 			"name": "tank",
 			"origin": [8, 8, -23],
-			"color": 0,
 			"children": [0, 1, 2, 3]
 		}
 	]

src/main/resources/assets/createindustry/models/block/steel_fluid_tank/block_single_window.json

@@ -30,7 +30,7 @@
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]},
 			"faces": {
 				"north": {"uv": [12, 4, 16, 12], "texture": "#1", "cullface": "north"},
-				"east": {"uv": [8, 4, 9, 12], "texture": "#1", "cullface": "north"},
+				"east": {"uv": [12, 4, 13, 12], "texture": "#1", "cullface": "north"},
 				"south": {"uv": [0, 4, 4, 12], "texture": "#1", "cullface": "north"}
 			}
 		},
@@ -40,7 +40,7 @@
 			"to": [16, 12, 4],
 			"faces": {
 				"east": {"uv": [12, 4, 16, 12], "texture": "#1", "cullface": "east"},
-				"south": {"uv": [8, 4, 9, 12], "texture": "#1", "cullface": "east"},
+				"south": {"uv": [12, 4, 13, 12], "texture": "#1", "cullface": "east"},
 				"west": {"uv": [0, 4, 4, 12], "texture": "#1", "cullface": "east"}
 			}
 		},
@@ -51,7 +51,7 @@
 			"faces": {
 				"north": {"uv": [0, 4, 4, 12], "texture": "#1", "cullface": "south"},
 				"south": {"uv": [12, 4, 16, 12], "texture": "#1", "cullface": "south"},
-				"west": {"uv": [8, 4, 9, 12], "texture": "#1", "cullface": "south"}
+				"west": {"uv": [12, 4, 13, 12], "texture": "#1", "cullface": "south"}
 			}
 		},
 		{
@@ -59,15 +59,15 @@
 			"from": [0, 4, 12],
 			"to": [1, 12, 16],
 			"faces": {
-				"north": {"uv": [8, 4, 9, 12], "texture": "#1", "cullface": "west"},
+				"north": {"uv": [12, 4, 13, 12], "texture": "#1", "cullface": "west"},
 				"east": {"uv": [0, 4, 4, 12], "texture": "#1", "cullface": "west"},
 				"west": {"uv": [12, 4, 16, 12], "texture": "#1", "cullface": "west"}
 			}
 		},
 		{
 			"name": "Window",
-			"from": [4, 4, 0.95],
+			"from": [4, 4, 1],
-			"to": [12, 12, 0.95],
+			"to": [12, 12, 1],
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]},
 			"faces": {
 				"north": {"uv": [0, 0, 8, 8], "texture": "#5", "cullface": "north"},
@@ -76,8 +76,8 @@
 		},
 		{
 			"name": "Window",
-			"from": [15.05, 4, 4],
+			"from": [15, 4, 4],
-			"to": [15.05, 12, 12],
+			"to": [15, 12, 12],
 			"faces": {
 				"east": {"uv": [0, 0, 8, 8], "texture": "#5", "cullface": "east"},
 				"west": {"uv": [0, 0, 8, 8], "texture": "#5", "cullface": "east"}
@@ -85,8 +85,8 @@
 		},
 		{
 			"name": "Window",
-			"from": [4, 4, 15.05],
+			"from": [4, 4, 15],
-			"to": [12, 12, 15.05],
+			"to": [12, 12, 15],
 			"faces": {
 				"north": {"uv": [0, 0, 8, 8], "texture": "#5", "cullface": "south"},
 				"south": {"uv": [0, 0, 8, 8], "texture": "#5", "cullface": "south"}
@@ -94,8 +94,8 @@
 		},
 		{
 			"name": "Window",
-			"from": [0.95, 4, 4],
+			"from": [1, 4, 4],
-			"to": [0.95, 12, 12],
+			"to": [1, 12, 12],
 			"faces": {
 				"east": {"uv": [0, 0, 8, 8], "texture": "#5", "cullface": "west"},
 				"west": {"uv": [0, 0, 8, 8], "texture": "#5", "cullface": "west"}
@@ -109,7 +109,7 @@
 			"faces": {
 				"north": {"uv": [0, 4, 4, 12], "texture": "#1", "cullface": "north"},
 				"south": {"uv": [12, 4, 16, 12], "texture": "#1", "cullface": "north"},
-				"west": {"uv": [7, 4, 8, 12], "texture": "#1", "cullface": "north"}
+				"west": {"uv": [3, 4, 4, 12], "texture": "#1", "cullface": "north"}
 			}
 		},
 		{
@@ -117,7 +117,7 @@
 			"from": [15, 4, 12],
 			"to": [16, 12, 16],
 			"faces": {
-				"north": {"uv": [7, 4, 8, 12], "texture": "#1", "cullface": "east"},
+				"north": {"uv": [3, 4, 4, 12], "texture": "#1", "cullface": "east"},
 				"east": {"uv": [0, 4, 4, 12], "texture": "#1", "cullface": "east"},
 				"west": {"uv": [12, 4, 16, 12], "texture": "#1", "cullface": "east"}
 			}
@@ -128,7 +128,7 @@
 			"to": [4, 12, 16],
 			"faces": {
 				"north": {"uv": [12, 4, 16, 12], "texture": "#1", "cullface": "south"},
-				"east": {"uv": [7, 4, 8, 12], "texture": "#1", "cullface": "south"},
+				"east": {"uv": [3, 4, 4, 12], "texture": "#1", "cullface": "south"},
 				"south": {"uv": [0, 4, 4, 12], "texture": "#1", "cullface": "south"}
 			}
 		},
@@ -138,7 +138,7 @@
 			"to": [1, 12, 4],
 			"faces": {
 				"east": {"uv": [12, 4, 16, 12], "texture": "#1", "cullface": "west"},
-				"south": {"uv": [7, 4, 8, 12], "texture": "#1", "cullface": "west"},
+				"south": {"uv": [3, 4, 4, 12], "texture": "#1", "cullface": "west"},
 				"west": {"uv": [0, 4, 4, 12], "texture": "#1", "cullface": "west"}
 			}
 		},

src/main/resources/assets/createindustry/models/block/steel_fluid_tank/block_single_window_ne.json

@@ -16,14 +16,14 @@
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]},
 			"faces": {
 				"east": {"uv": [4, 4, 16, 12], "texture": "#1"},
-				"south": {"uv": [4, 4, 5, 12], "texture": "#1"},
+				"south": {"uv": [12, 4, 13, 12], "texture": "#1"},
 				"west": {"uv": [0, 4, 12, 12], "texture": "#1"}
 			}
 		},
 		{
 			"name": "Window",
-			"from": [0, 4, 0.95],
+			"from": [0, 4, 1],
-			"to": [4, 12, 0.95],
+			"to": [4, 12, 1],
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]},
 			"faces": {
 				"north": {"uv": [0, 0, 4, 8], "texture": "#5"},
@@ -32,8 +32,8 @@
 		},
 		{
 			"name": "Window",
-			"from": [15.05, 4, 12],
+			"from": [15, 4, 12],
-			"to": [15.05, 12, 16],
+			"to": [15, 12, 16],
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]},
 			"faces": {
 				"east": {"uv": [4, 0, 8, 8], "texture": "#5"},
@@ -48,7 +48,7 @@
 			"faces": {
 				"north": {"uv": [0, 4, 12, 12], "texture": "#1"},
 				"south": {"uv": [4, 4, 16, 12], "texture": "#1"},
-				"west": {"uv": [11, 4, 12, 12], "texture": "#1"}
+				"west": {"uv": [3, 4, 4, 12], "texture": "#1"}
 			}
 		},
 		{

src/main/resources/assets/createindustry/models/block/steel_fluid_tank/block_single_window_nw.json

@@ -16,14 +16,14 @@
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]},
 			"faces": {
 				"north": {"uv": [4, 4, 16, 12], "texture": "#1"},
-				"east": {"uv": [4, 4, 5, 12], "texture": "#1"},
+				"east": {"uv": [12, 4, 13, 12], "texture": "#1"},
 				"south": {"uv": [0, 4, 12, 12], "texture": "#1"}
 			}
 		},
 		{
 			"name": "Window",
-			"from": [0.95, 4, 12],
+			"from": [1, 4, 12],
-			"to": [0.95, 12, 16],
+			"to": [1, 12, 16],
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]},
 			"faces": {
 				"east": {"uv": [4, 0, 8, 8], "texture": "#5"},
@@ -32,8 +32,8 @@
 		},
 		{
 			"name": "Window",
-			"from": [12, 4, 0.95],
+			"from": [12, 4, 1],
-			"to": [16, 12, 0.95],
+			"to": [16, 12, 1],
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]},
 			"faces": {
 				"north": {"uv": [4, 0, 8, 8], "texture": "#5"},
@@ -47,7 +47,7 @@
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]},
 			"faces": {
 				"east": {"uv": [4, 4, 16, 12], "texture": "#1"},
-				"south": {"uv": [11, 4, 12, 12], "texture": "#1"},
+				"south": {"uv": [3, 4, 4, 12], "texture": "#1"},
 				"west": {"uv": [0, 4, 12, 12], "texture": "#1"}
 			}
 		},

src/main/resources/assets/createindustry/models/block/steel_fluid_tank/block_single_window_se.json

@@ -6,7 +6,7 @@
 		"1": "createindustry:block/steel_fluid_tank",
 		"4": "createindustry:block/steel_fluid_tank_inner",
 		"5": "createindustry:block/steel_fluid_tank_window_single",
-		"particle": "createindustry:block/fluid_tank"
+		"particle": "createindustry:block/steel_fluid_tank"
 	},
 	"elements": [
 		{
@@ -17,13 +17,13 @@
 			"faces": {
 				"north": {"uv": [0, 4, 12, 12], "texture": "#1"},
 				"south": {"uv": [4, 4, 16, 12], "texture": "#1"},
-				"west": {"uv": [4, 4, 5, 12], "texture": "#1"}
+				"west": {"uv": [12, 4, 13, 12], "texture": "#1"}
 			}
 		},
 		{
 			"name": "Window",
-			"from": [15.05, 4, 0],
+			"from": [15, 4, 0],
-			"to": [15.05, 12, 4],
+			"to": [15, 12, 4],
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]},
 			"faces": {
 				"east": {"uv": [0, 0, 4, 8], "texture": "#5"},
@@ -32,8 +32,8 @@
 		},
 		{
 			"name": "Window",
-			"from": [0, 4, 15.05],
+			"from": [0, 4, 15],
-			"to": [4, 12, 15.05],
+			"to": [4, 12, 15],
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]},
 			"faces": {
 				"north": {"uv": [0, 0, 4, 8], "texture": "#5"},
@@ -46,7 +46,7 @@
 			"to": [16, 12, 16],
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]},
 			"faces": {
-				"north": {"uv": [11, 4, 12, 12], "texture": "#1"},
+				"north": {"uv": [3, 4, 4, 12], "texture": "#1"},
 				"east": {"uv": [0, 4, 12, 12], "texture": "#1"},
 				"west": {"uv": [4, 4, 16, 12], "texture": "#1"}
 			}

src/main/resources/assets/createindustry/models/block/steel_fluid_tank/block_single_window_sw.json

@@ -15,15 +15,15 @@
 			"to": [1, 12, 16],
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]},
 			"faces": {
-				"north": {"uv": [4, 4, 5, 12], "texture": "#1"},
+				"north": {"uv": [12, 4, 13, 12], "texture": "#1"},
 				"east": {"uv": [0, 4, 12, 12], "texture": "#1"},
 				"west": {"uv": [4, 4, 16, 12], "texture": "#1"}
 			}
 		},
 		{
 			"name": "Window",
-			"from": [12, 4, 15.05],
+			"from": [12, 4, 15],
-			"to": [16, 12, 15.05],
+			"to": [16, 12, 15],
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]},
 			"faces": {
 				"north": {"uv": [4, 0, 8, 8], "texture": "#5"},
@@ -32,8 +32,8 @@
 		},
 		{
 			"name": "Window",
-			"from": [0.95, 4, 0],
+			"from": [1, 4, 0],
-			"to": [0.95, 12, 4],
+			"to": [1, 12, 4],
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]},
 			"faces": {
 				"east": {"uv": [0, 0, 4, 8], "texture": "#5"},
@@ -47,7 +47,7 @@
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]},
 			"faces": {
 				"north": {"uv": [4, 4, 16, 12], "texture": "#1"},
-				"east": {"uv": [11, 4, 12, 12], "texture": "#1"},
+				"east": {"uv": [3, 4, 4, 12], "texture": "#1"},
 				"south": {"uv": [0, 4, 12, 12], "texture": "#1"}
 			}
 		},

src/main/resources/assets/createindustry/models/block/steel_fluid_tank/block_top_window.json

@@ -30,7 +30,7 @@
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]},
 			"faces": {
 				"north": {"uv": [12, 4, 16, 16], "texture": "#1", "cullface": "north"},
-				"east": {"uv": [0, 4, 1, 16], "texture": "#1", "cullface": "north"},
+				"east": {"uv": [12, 4, 13, 16], "texture": "#1", "cullface": "north"},
 				"south": {"uv": [0, 4, 4, 16], "texture": "#1", "cullface": "north"}
 			}
 		},
@@ -40,7 +40,7 @@
 			"to": [16, 12, 4],
 			"faces": {
 				"east": {"uv": [12, 4, 16, 16], "texture": "#1", "cullface": "east"},
-				"south": {"uv": [0, 4, 1, 16], "texture": "#1", "cullface": "east"},
+				"south": {"uv": [12, 4, 13, 16], "texture": "#1", "cullface": "east"},
 				"west": {"uv": [0, 4, 4, 16], "texture": "#1", "cullface": "east"}
 			}
 		},
@@ -51,7 +51,7 @@
 			"faces": {
 				"north": {"uv": [0, 4, 4, 16], "texture": "#1", "cullface": "south"},
 				"south": {"uv": [12, 4, 16, 16], "texture": "#1", "cullface": "south"},
-				"west": {"uv": [0, 4, 1, 16], "texture": "#1", "cullface": "south"}
+				"west": {"uv": [12, 4, 13, 16], "texture": "#1", "cullface": "south"}
 			}
 		},
 		{
@@ -59,15 +59,15 @@
 			"from": [0, 0, 12],
 			"to": [1, 12, 16],
 			"faces": {
-				"north": {"uv": [0, 4, 1, 16], "texture": "#1", "cullface": "west"},
+				"north": {"uv": [12, 4, 13, 16], "texture": "#1", "cullface": "west"},
 				"east": {"uv": [0, 4, 4, 16], "texture": "#1", "cullface": "west"},
 				"west": {"uv": [12, 4, 16, 16], "texture": "#1", "cullface": "west"}
 			}
 		},
 		{
 			"name": "Window",
-			"from": [4, 0, 0.95],
+			"from": [4, 0, 1],
-			"to": [12, 12, 0.95],
+			"to": [12, 12, 1],
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]},
 			"faces": {
 				"north": {"uv": [0, 0, 8, 12], "texture": "#3", "cullface": "north"},
@@ -76,8 +76,8 @@
 		},
 		{
 			"name": "Window",
-			"from": [15.05, 0, 4],
+			"from": [15, 0, 4],
-			"to": [15.05, 12, 12],
+			"to": [15, 12, 12],
 			"faces": {
 				"east": {"uv": [0, 0, 8, 12], "texture": "#3", "cullface": "east"},
 				"west": {"uv": [0, 0, 8, 12], "texture": "#3", "cullface": "east"}
@@ -85,8 +85,8 @@
 		},
 		{
 			"name": "Window",
-			"from": [4, 0, 15.05],
+			"from": [4, 0, 15],
-			"to": [12, 12, 15.05],
+			"to": [12, 12, 15],
 			"faces": {
 				"north": {"uv": [0, 0, 8, 12], "texture": "#3", "cullface": "south"},
 				"south": {"uv": [0, 0, 8, 12], "texture": "#3", "cullface": "south"}
@@ -94,8 +94,8 @@
 		},
 		{
 			"name": "Window",
-			"from": [0.95, 0, 4],
+			"from": [1, 0, 4],
-			"to": [0.95, 12, 12],
+			"to": [1, 12, 12],
 			"faces": {
 				"east": {"uv": [0, 0, 8, 12], "texture": "#3", "cullface": "west"},
 				"west": {"uv": [0, 0, 8, 12], "texture": "#3", "cullface": "west"}
@@ -109,7 +109,7 @@
 			"faces": {
 				"north": {"uv": [0, 4, 4, 16], "texture": "#1", "cullface": "north"},
 				"south": {"uv": [12, 4, 16, 16], "texture": "#1", "cullface": "north"},
-				"west": {"uv": [15, 4, 16, 16], "texture": "#1", "cullface": "north"}
+				"west": {"uv": [3, 4, 4, 16], "texture": "#1", "cullface": "north"}
 			}
 		},
 		{
@@ -117,7 +117,7 @@
 			"from": [15, 0, 12],
 			"to": [16, 12, 16],
 			"faces": {
-				"north": {"uv": [15, 4, 16, 16], "texture": "#1", "cullface": "east"},
+				"north": {"uv": [3, 4, 4, 16], "texture": "#1", "cullface": "east"},
 				"east": {"uv": [0, 4, 4, 16], "texture": "#1", "cullface": "east"},
 				"west": {"uv": [12, 4, 16, 16], "texture": "#1", "cullface": "east"}
 			}
@@ -128,7 +128,7 @@
 			"to": [4, 12, 16],
 			"faces": {
 				"north": {"uv": [12, 4, 16, 16], "texture": "#1", "cullface": "south"},
-				"east": {"uv": [15, 4, 16, 16], "texture": "#1", "cullface": "south"},
+				"east": {"uv": [3, 4, 4, 16], "texture": "#1", "cullface": "south"},
 				"south": {"uv": [0, 4, 4, 16], "texture": "#1", "cullface": "south"}
 			}
 		},
@@ -138,7 +138,7 @@
 			"to": [1, 12, 4],
 			"faces": {
 				"east": {"uv": [12, 4, 16, 16], "texture": "#1", "cullface": "west"},
-				"south": {"uv": [15, 4, 16, 16], "texture": "#1", "cullface": "west"},
+				"south": {"uv": [3, 4, 4, 16], "texture": "#1", "cullface": "west"},
 				"west": {"uv": [0, 4, 4, 16], "texture": "#1", "cullface": "west"}
 			}
 		}

src/main/resources/assets/createindustry/models/block/steel_fluid_tank/block_top_window_ne.json

@@ -16,14 +16,14 @@
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]},
 			"faces": {
 				"east": {"uv": [4, 4, 16, 16], "texture": "#1"},
-				"south": {"uv": [4, 4, 5, 16], "texture": "#1"},
+				"south": {"uv": [12, 4, 13, 16], "texture": "#1"},
 				"west": {"uv": [0, 4, 12, 16], "texture": "#1"}
 			}
 		},
 		{
 			"name": "Window",
-			"from": [0, 0, 0.95],
+			"from": [0, 0, 1],
-			"to": [4, 12, 0.95],
+			"to": [4, 12, 1],
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]},
 			"faces": {
 				"north": {"uv": [0, 0, 4, 12], "texture": "#3"},
@@ -32,8 +32,8 @@
 		},
 		{
 			"name": "Window",
-			"from": [15.05, 0, 12],
+			"from": [15, 0, 12],
-			"to": [15.05, 12, 16],
+			"to": [15, 12, 16],
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]},
 			"faces": {
 				"east": {"uv": [4, 0, 8, 12], "texture": "#3"},
@@ -48,7 +48,7 @@
 			"faces": {
 				"north": {"uv": [0, 4, 12, 16], "texture": "#1"},
 				"south": {"uv": [4, 4, 16, 16], "texture": "#1"},
-				"west": {"uv": [11, 4, 12, 16], "texture": "#1"}
+				"west": {"uv": [3, 4, 4, 16], "texture": "#1"}
 			}
 		},
 		{

src/main/resources/assets/createindustry/models/block/steel_fluid_tank/block_top_window_nw.json

@@ -16,14 +16,14 @@
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]},
 			"faces": {
 				"north": {"uv": [4, 4, 16, 16], "texture": "#1"},
-				"east": {"uv": [4, 4, 5, 16], "texture": "#1"},
+				"east": {"uv": [12, 4, 13, 16], "texture": "#1"},
 				"south": {"uv": [0, 4, 12, 16], "texture": "#1"}
 			}
 		},
 		{
 			"name": "Window",
-			"from": [0.95, 0, 12],
+			"from": [1, 0, 12],
-			"to": [0.95, 12, 16],
+			"to": [1, 12, 16],
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]},
 			"faces": {
 				"east": {"uv": [4, 0, 8, 12], "texture": "#3"},
@@ -32,8 +32,8 @@
 		},
 		{
 			"name": "Window",
-			"from": [12, 0, 0.95],
+			"from": [12, 0, 1],
-			"to": [16, 12, 0.95],
+			"to": [16, 12, 1],
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]},
 			"faces": {
 				"north": {"uv": [4, 0, 8, 12], "texture": "#3"},
@@ -47,7 +47,7 @@
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]},
 			"faces": {
 				"east": {"uv": [4, 4, 16, 16], "texture": "#1"},
-				"south": {"uv": [11, 4, 12, 16], "texture": "#1"},
+				"south": {"uv": [3, 4, 4, 16], "texture": "#1"},
 				"west": {"uv": [0, 4, 12, 16], "texture": "#1"}
 			}
 		},

src/main/resources/assets/createindustry/models/block/steel_fluid_tank/block_top_window_se.json

@@ -17,13 +17,13 @@
 			"faces": {
 				"north": {"uv": [0, 4, 12, 16], "texture": "#1"},
 				"south": {"uv": [4, 4, 16, 16], "texture": "#1"},
-				"west": {"uv": [4, 4, 5, 16], "texture": "#1"}
+				"west": {"uv": [12, 4, 13, 16], "texture": "#1"}
 			}
 		},
 		{
 			"name": "Window",
-			"from": [15.05, 0, 0],
+			"from": [15, 0, 0],
-			"to": [15.05, 12, 4],
+			"to": [15, 12, 4],
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]},
 			"faces": {
 				"east": {"uv": [0, 0, 4, 12], "texture": "#3"},
@@ -32,8 +32,8 @@
 		},
 		{
 			"name": "Window",
-			"from": [0, 0, 15.05],
+			"from": [0, 0, 15],
-			"to": [4, 12, 15.05],
+			"to": [4, 12, 15],
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]},
 			"faces": {
 				"north": {"uv": [0, 0, 4, 12], "texture": "#3"},
@@ -46,7 +46,7 @@
 			"to": [16, 12, 16],
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]},
 			"faces": {
-				"north": {"uv": [11, 4, 12, 16], "texture": "#1"},
+				"north": {"uv": [3, 4, 4, 16], "texture": "#1"},
 				"east": {"uv": [0, 4, 12, 16], "texture": "#1"},
 				"west": {"uv": [4, 4, 16, 16], "texture": "#1"}
 			}

src/main/resources/assets/createindustry/models/block/steel_fluid_tank/block_top_window_sw.json

@@ -15,15 +15,15 @@
 			"to": [1, 12, 16],
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]},
 			"faces": {
-				"north": {"uv": [4, 4, 5, 16], "texture": "#1"},
+				"north": {"uv": [12, 4, 13, 16], "texture": "#1"},
 				"east": {"uv": [0, 4, 12, 16], "texture": "#1"},
 				"west": {"uv": [4, 4, 16, 16], "texture": "#1"}
 			}
 		},
 		{
 			"name": "Window",
-			"from": [12, 0, 15.05],
+			"from": [12, 0, 15],
-			"to": [16, 12, 15.05],
+			"to": [16, 12, 15],
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]},
 			"faces": {
 				"north": {"uv": [4, 0, 8, 12], "texture": "#3"},
@@ -32,8 +32,8 @@
 		},
 		{
 			"name": "Window",
-			"from": [0.95, 0, 0],
+			"from": [1, 0, 0],
-			"to": [0.95, 12, 4],
+			"to": [1, 12, 4],
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]},
 			"faces": {
 				"east": {"uv": [0, 0, 4, 12], "texture": "#3"},
@@ -47,7 +47,7 @@
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]},
 			"faces": {
 				"north": {"uv": [4, 4, 16, 16], "texture": "#1"},
-				"east": {"uv": [11, 4, 12, 16], "texture": "#1"},
+				"east": {"uv": [3, 4, 4, 16], "texture": "#1"},
 				"south": {"uv": [0, 4, 12, 16], "texture": "#1"}
 			}
 		},

src/main/resources/data/createindustry/recipes/mixing/gun_powder.json

@@ -0,0 +1,35 @@
+
+{
+  "type": "create:mixing",
+  "ingredients": [
+    {
+      "item": "createindustry:nitrate_dust"
+    },
+    {
+      "item": "createindustry:nitrate_dust"
+    },
+    {
+      "item": "createindustry:nitrate_dust"
+    },
+    {
+      "tag": "forge:dusts/charcoal"
+
+    },
+
+    {
+      "tag": "forge:dusts/charcoal"
+
+    },
+    {
+      "item": "createindustry:sulfur_dust"
+
+    }
+  ],
+  "results": [
+    {
+      "item": "minecraft:gunpowder",
+      "count": 6
+
+    }
+  ]
+}

src/main/resources/data/createindustry/recipes/stonecutting/aluminum_post.json

@@ -1,9 +0,0 @@
-
-{
-  "type": "minecraft:stonecutting",
-  "ingredient": {
-    "tag": "forge:ingots/aluminum"
-  },
-  "result": "createindustry:aluminum_post",
-  "count": 4
-}

src/main/resources/data/createindustry/recipes/stonecutting/steel_railing.json

@@ -1,9 +0,0 @@
-
-{
-  "type": "minecraft:stonecutting",
-  "ingredient": {
-    "tag": "forge:ingots/steel"
-  },
-  "result": "createindustry:steel_railing",
-  "count": 4
-}

src/main/resources/data/createindustry/recipes/stonecutting/steel_scaffolding.json

@@ -1,9 +0,0 @@
-
-{
-  "type": "minecraft:stonecutting",
-  "ingredient": {
-    "tag": "forge:ingots/steel"
-  },
-  "result": "createindustry:steel_scaffolding",
-  "count": 2
-}