diff --git a/src/generated/resources/.cache/9047e4e94996e73e9dfde3738763637fb609e07e b/src/generated/resources/.cache/9047e4e94996e73e9dfde3738763637fb609e07e index 2b233a82..cb027df8 100644 --- a/src/generated/resources/.cache/9047e4e94996e73e9dfde3738763637fb609e07e +++ b/src/generated/resources/.cache/9047e4e94996e73e9dfde3738763637fb609e07e @@ -1,2 +1,2 @@ -// 1.19.2 2023-11-24T16:01:59.4223239 Create: The Factory Must Grow's lang merger -b27bea40ccf70838d54173cae8099faafdd1ee11 assets/createindustry/lang/en_us.json +// 1.19.2 2023-11-25T12:00:36.1649844 Create: The Factory Must Grow's lang merger +97056374597c49ee4a8014ca906c9815a82274d9 assets/createindustry/lang/en_us.json diff --git a/src/generated/resources/assets/createindustry/lang/en_us.json b/src/generated/resources/assets/createindustry/lang/en_us.json index 753ec63c..3cc32d4d 100644 --- a/src/generated/resources/assets/createindustry/lang/en_us.json +++ b/src/generated/resources/assets/createindustry/lang/en_us.json @@ -447,7 +447,10 @@ "create.goggles.distillation_tower.found_outputs": "Number of Outputs: %1$s", "create.goggles.distillation_tower.no_outputs": "No Output Blocks Found", "create.goggles.blast_furnace.stats": "Blast Furnace:", - "create.goggles.blast_furnace.size_stats": "Size:", + + "create.distillation_tower.size": "Size", + "create.distillation_tower.heat": "Heat", + "create.goggles.blast_furnace.fuel_amount": "Fuel Amount: %1$s", "create.goggles.blast_furnace.item_count": "Item Count: %1$s", "create.goggles.blast_furnace.height": "Height: %1$s", diff --git a/src/main/java/com/drmangotea/createindustry/blocks/deposits/FluidDepositBlockEntity.java b/src/main/java/com/drmangotea/createindustry/blocks/deposits/FluidDepositBlockEntity.java index a3d85c81..10c42366 100644 --- a/src/main/java/com/drmangotea/createindustry/blocks/deposits/FluidDepositBlockEntity.java +++ b/src/main/java/com/drmangotea/createindustry/blocks/deposits/FluidDepositBlockEntity.java @@ -17,13 +17,12 @@ import java.util.List; public class FluidDepositBlockEntity extends SmartBlockEntity { - public final int baseFluidAmount= Create.RANDOM.nextInt(300000000); + public final int baseFluidAmount= Create.RANDOM.nextInt(3000000); public final int fluidAmountToBuckets =baseFluidAmount/1000; public int fluidAmount= fluidAmountToBuckets; public FluidDepositBlockEntity(BlockEntityType type, BlockPos pos, BlockState state) { super(type, pos, state); - CreateTFMG.LOGGER.debug("Created Oil Deposit with "+baseFluidAmount+" buckets of Crude Oil"); } @Override diff --git a/src/main/java/com/drmangotea/createindustry/blocks/machines/oil_processing/pumpjack/machine_input/MachineInputBlockEntity.java b/src/main/java/com/drmangotea/createindustry/blocks/machines/oil_processing/pumpjack/machine_input/MachineInputBlockEntity.java index 5044b42e..1c51c523 100644 --- a/src/main/java/com/drmangotea/createindustry/blocks/machines/oil_processing/pumpjack/machine_input/MachineInputBlockEntity.java +++ b/src/main/java/com/drmangotea/createindustry/blocks/machines/oil_processing/pumpjack/machine_input/MachineInputBlockEntity.java @@ -68,7 +68,7 @@ public class MachineInputBlockEntity extends KineticBlockEntity { */ Lang.translate("goggles.machine_input.power_level") .style(ChatFormatting.AQUA) - .add(Lang.translate("goggles.number", this.getPowerLevel())) + .add(Lang.translate("goggles.misc.number", this.getPowerLevel())) .forGoggles(tooltip,1); diff --git a/src/main/resources/assets/createindustry/lang/default/interface.json b/src/main/resources/assets/createindustry/lang/default/interface.json index 41abbc1c..8db04f8a 100644 --- a/src/main/resources/assets/createindustry/lang/default/interface.json +++ b/src/main/resources/assets/createindustry/lang/default/interface.json @@ -20,7 +20,8 @@ "create.goggles.distillation_tower.found_outputs": "Number of Outputs: %1$s", "create.goggles.distillation_tower.no_outputs": "No Output Blocks Found", "create.goggles.blast_furnace.stats": "Blast Furnace:", - "create.goggles.blast_furnace.size_stats": "Size:", + "create.distillation_tower.size": "Size", + "create.distillation_tower.heat": "Heat", "create.goggles.blast_furnace.fuel_amount": "Fuel Amount: %1$s", "create.goggles.blast_furnace.item_count": "Item Count: %1$s", "create.goggles.blast_furnace.height": "Height: %1$s", diff --git a/src/main/resources/assets/createindustry/models/block/surface_scanner/flag.json b/src/main/resources/assets/createindustry/models/block/surface_scanner/flag.json index 98ce8f37..d311ddbc 100644 --- a/src/main/resources/assets/createindustry/models/block/surface_scanner/flag.json +++ b/src/main/resources/assets/createindustry/models/block/surface_scanner/flag.json @@ -2,6 +2,7 @@ "credit": "Made with Blockbench", "textures": { "0": "createindustry:block/surface_scanner", + "1": "createindustry:block/surface_scanner_flags/flag1", "particle": "createindustry:block/surface_scanner" }, "elements": [ @@ -30,13 +31,13 @@ } }, { - "from": [15.5, 4.5, 12.5], + "from": [15.5, 3.5, 11.5], "to": [15.5, 7.5, 14.5], "faces": { "north": {"uv": [0, 0, 0, 3], "rotation": 180, "texture": "#0"}, - "east": {"uv": [12.5, 5.5, 12.5, 5], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#1"}, "south": {"uv": [0, 0, 0, 3], "texture": "#0"}, - "west": {"uv": [12.5, 5, 13.25, 5.5], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#1"}, "up": {"uv": [0, 0, 0, 6], "rotation": 180, "texture": "#0"}, "down": {"uv": [0, 0, 0, 6], "texture": "#0"} } diff --git a/src/main/resources/assets/createindustry/textures/block/surface_scanner.png b/src/main/resources/assets/createindustry/textures/block/surface_scanner.png index 7362d5e0..b3207892 100644 Binary files a/src/main/resources/assets/createindustry/textures/block/surface_scanner.png and b/src/main/resources/assets/createindustry/textures/block/surface_scanner.png differ diff --git a/src/main/resources/assets/createindustry/textures/block/surface_scanner_flags/flag1.png b/src/main/resources/assets/createindustry/textures/block/surface_scanner_flags/flag1.png new file mode 100644 index 00000000..c22ba6a0 Binary files /dev/null and b/src/main/resources/assets/createindustry/textures/block/surface_scanner_flags/flag1.png differ