Commit Graph

74 Commits

Author SHA1 Message Date
lonevox
cb5e827c07 Remove unneeded block stress defaults
Engine back blocks had stress capacities, which aren't needed because the engine front blocks are the stress producers.
2023-12-19 19:40:21 +13:00
DrMangoTea
53b140284d random fixes 2023-11-25 12:41:26 +01:00
DrMangoTea
2102ec5d97 readme.txt 2023-11-24 16:33:02 +01:00
DrMangoTea
4a3a88e9d8 final touches 2023-11-24 16:29:16 +01:00
DrMangoTea
5418294dc9 textures + casting basin rendering 2023-11-20 19:13:32 +01:00
DrMangoTea
f5a1c4404f some textures :3 2023-11-20 15:07:01 +01:00
DrMangoTea
9fb8571d03 some textures :3 2023-11-20 15:01:10 +01:00
DrMangoTea
8452d3e167 completely random improvements 2023-11-16 18:00:16 +01:00
DrMangoTea
d4c971e4c3 fixes + balancing 2023-11-15 14:38:04 +01:00
DrMangoTea
ed1b3607df typo :( 2023-11-14 15:59:31 +01:00
DrMangoTea
34331772fa coke oven fixes + cast iron rebalance 2023-11-14 15:57:19 +01:00
DrMangoTea
f9ebef8568 encasing 2023-11-10 17:16:54 +01:00
DrMangoTea
1b86287af7 Merge remote-tracking branch 'origin/main' 2023-11-06 16:18:36 +01:00
DrMangoTea
f9385558cf sounds 2023-11-06 16:18:11 +01:00
smoot
47addac5ea Update interface.json
minor edits
2023-11-05 19:52:41 +03:00
smoot
5b69232c8c Update ponders.json
even more fixes
2023-11-05 19:50:44 +03:00
DrMangoTea
59399996ca coke oven rendering+fluids 2023-11-05 11:27:57 +01:00
DrMangoTea
749a7b3a76 Merge remote-tracking branch 'origin/main' 2023-11-04 20:10:40 +01:00
DrMangoTea
1f40e22f49 distillation tower/distiller recipe localization improvement :3 2023-11-04 20:10:14 +01:00
smoot
097408348d Update ponders.json
spelling mistake fixes
2023-11-04 21:47:59 +03:00
smoot
88485a6577 Update ponders.json
spelling mistake fixes
2023-11-04 21:46:32 +03:00
smoot
dc2f008be8 Update interface.json
grammar fixes
2023-11-04 21:34:25 +03:00
smoot
e579c43c07 Update ponders.json
grammar and formatting fixes
2023-11-04 21:27:08 +03:00
DrMangoTea
17cc2d2e2e ponders 2023-11-04 18:13:21 +01:00
DrMangoTea
61a76e9b51 Merge remote-tracking branch 'origin/main' 2023-11-01 20:53:28 +01:00
DrMangoTea
08131ec23a pipe fix 2023-11-01 20:53:02 +01:00
xuwu / luna
77fbf7eabe Steel Color Palette Moment (color swap might need fixes) 2023-11-01 11:18:01 -08:00
DrMangoTea
ea3952297c new logo + fixes 2023-11-01 15:01:03 +01:00
DrMangoTea
b0188b6ab2 new logo + fixes 2023-11-01 15:00:50 +01:00
DrMangoTea
2bc2a66f9c pipe locking + fixes 2023-10-31 21:42:33 +01:00
DrMangoTea
fd4f3d3d85 recipes 3 2023-10-29 09:33:07 +01:00
DrMangoTea
951af673bb recipes 2 2023-10-29 09:31:43 +01:00
DrMangoTea
1e2997f136 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	src/generated/resources/.cache/9047e4e94996e73e9dfde3738763637fb609e07e
2023-10-29 09:29:46 +01:00
DrMangoTea
36cf52aa6c Merge remote-tracking branch 'origin/main'
# Conflicts:
#	src/generated/resources/.cache/9047e4e94996e73e9dfde3738763637fb609e07e
#	src/generated/resources/data/create/tags/blocks/casing.json
#	src/generated/resources/data/create/tags/blocks/fan_transparent.json
#	src/generated/resources/data/create/tags/blocks/safe_nbt.json
#	src/generated/resources/data/create/tags/blocks/wrench_pickup.json
#	src/generated/resources/data/create/tags/items/casing.json
#	src/generated/resources/data/create/tags/items/contraption_controlled.json
#	src/generated/resources/data/create/tags/items/create_ingots.json
#	src/generated/resources/data/forge/tags/blocks/concrete.json
#	src/generated/resources/data/forge/tags/blocks/factory_floor.json
#	src/generated/resources/data/forge/tags/blocks/rebar_concrete.json
#	src/generated/resources/data/forge/tags/blocks/storage_blocks.json
#	src/generated/resources/data/forge/tags/blocks/storage_blocks/aluminum.json
#	src/generated/resources/data/forge/tags/blocks/storage_blocks/cast_iron.json
#	src/generated/resources/data/forge/tags/blocks/storage_blocks/steel.json
#	src/generated/resources/data/forge/tags/items/buckets/diesel.json
#	src/generated/resources/data/forge/tags/items/buckets/gasoline.json
#	src/generated/resources/data/forge/tags/items/buckets/kerosene.json
#	src/generated/resources/data/forge/tags/items/buckets/napalm.json
#	src/generated/resources/data/forge/tags/items/buckets/naphtha.json
#	src/generated/resources/data/forge/tags/items/buckets/plastic.json
#	src/generated/resources/data/forge/tags/items/concrete.json
#	src/generated/resources/data/forge/tags/items/dusts/coal_coke.json
#	src/generated/resources/data/forge/tags/items/factory_floor.json
#	src/generated/resources/data/forge/tags/items/ingots/aluminum.json
#	src/generated/resources/data/forge/tags/items/ingots/cast_iron.json
#	src/generated/resources/data/forge/tags/items/ingots/steel.json
#	src/generated/resources/data/forge/tags/items/rebar_concrete.json
#	src/generated/resources/data/forge/tags/items/storage_blocks.json
#	src/generated/resources/data/forge/tags/items/storage_blocks/aluminum.json
#	src/generated/resources/data/forge/tags/items/storage_blocks/cast_iron.json
#	src/generated/resources/data/forge/tags/items/storage_blocks/steel.json
#	src/generated/resources/data/minecraft/tags/blocks/azalea_root_replaceable.json
#	src/generated/resources/data/minecraft/tags/blocks/beacon_base_blocks.json
#	src/generated/resources/data/minecraft/tags/blocks/climbable.json
#	src/generated/resources/data/minecraft/tags/blocks/doors.json
#	src/generated/resources/data/minecraft/tags/blocks/dripstone_replaceable_blocks.json
#	src/generated/resources/data/minecraft/tags/blocks/lush_ground_replaceable.json
#	src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json
#	src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json
#	src/generated/resources/data/minecraft/tags/blocks/moss_replaceable.json
#	src/generated/resources/data/minecraft/tags/blocks/needs_diamond_tool.json
#	src/generated/resources/data/minecraft/tags/blocks/needs_iron_tool.json
#	src/generated/resources/data/minecraft/tags/blocks/needs_stone_tool.json
#	src/generated/resources/data/minecraft/tags/blocks/slabs.json
#	src/generated/resources/data/minecraft/tags/blocks/stairs.json
#	src/generated/resources/data/minecraft/tags/blocks/walls.json
#	src/generated/resources/data/minecraft/tags/blocks/wooden_doors.json
#	src/generated/resources/data/minecraft/tags/items/doors.json
#	src/generated/resources/data/minecraft/tags/items/slabs.json
#	src/generated/resources/data/minecraft/tags/items/stairs.json
#	src/generated/resources/data/minecraft/tags/items/walls.json
#	src/generated/resources/data/quark/tags/blocks/non_double_door.json
#	src/main/resources/data/createindustry/recipes/coking/test_coking.json
#	src/main/resources/data/createindustry/recipes/coking/test_coking_aaaaa.json
#	src/main/resources/data/createindustry/recipes/distillation/naphtha.json
#	src/main/resources/data/createindustry/recipes/industrial_blasting/test_blast.json
#	src/main/resources/data/createindustry/recipes/industrial_blasting/test_blasting_aaaaa.json
2023-10-29 09:29:34 +01:00
DrMangoTea
d8ffaa88e2 Delete src/generated/resources/.cache directory 2023-10-29 09:22:02 +01:00
DrMangoTea
b14a70c0b1 Delete src/generated/resources/data directory 2023-10-29 09:21:53 +01:00
DrMangoTea
088da50702 recipes 2 2023-10-29 09:15:45 +01:00
DrMangoTea
25001d95b0 recipes 2023-10-28 23:41:12 +02:00
DrMangoTea
9fd77c3f2c id changed back to createindustry(compatibility reasons) + recipes 2023-10-28 23:38:39 +02:00
DrMangoTea
bc70d270b7 id changed back to createindustry(compatibility reasons) + recipes 2023-10-28 23:36:14 +02:00
DrMangoTea
77d95d2f4e idk anymore 3 2023-10-28 22:44:13 +02:00
DrMangoTea
6077e7543c idk anymore 2 2023-10-28 14:14:03 +02:00
DrMangoTea
4ff02250d6 idk anymore 2023-10-27 22:42:00 +02:00
DrMangoTea
806ef2e5c8 bars, rebar formwork, ladders 2023-10-27 09:46:20 +02:00
DrMangoTea
af6f657de6 pipes,
trusses and random fixes
2023-10-26 18:16:15 +02:00
DrMangoTea
1e8b38ab3c pumpjack rendering fix,
flarestacks
exhaust and casting jei interface
2023-10-25 22:58:42 +02:00
DrMangoTea
a534e865f1 engine fixes 2023-10-25 15:02:32 +02:00
DrMangoTea
795426b7d1 air intakes and engines 2023-10-25 14:52:39 +02:00
DrMangoTea
1dbe3a7868 casting 2023-10-10 14:08:55 +02:00
DrMangoTea
549b09f635 blast furnace stuff 2023-10-06 17:23:56 +02:00