Commit Graph

90 Commits

Author SHA1 Message Date
hadron13
17ab0baa7f Compiling to 1.18.2, Mixins do not work yet 2024-11-23 12:51:05 -03:00
DrMangoTea
dc87df19d6 Merge pull request #105 from DrMango14/jei-category-fix-1.19
Fix Output Fluid in AdvancedDistillationCategory
2024-08-28 21:47:09 +02:00
PouffyDev
04a6888472 Fix Output Fluid in AdvancedDistillationCategory
For some reason every fluid output was using the amount of the first output. 
This fixes that. @DrMango14 you better merge this or I'll take your liver.
2024-08-28 20:44:58 +01:00
DrMangoTea
f54098ff8d Merge pull request #91 from DrMango14/krystal's-shenanigans
Proper Datagen
2024-07-27 01:03:08 +02:00
pouffy
ede78c2bdc Polarizing Recipe 2024-07-22 23:02:19 +01:00
pouffy
a32804c1cb Proper Datagen
- Also: better flamethrower fuel registry
- Also: Blast Stove multiblock & my multiblock system.
2024-07-22 17:00:46 +01:00
DrMangoTea
303be9dae4 0.9.0c 2024-07-05 00:12:07 +02:00
DrMangoTea
b7a62684b8 0.9.0 2024-07-04 20:47:50 +02:00
DrMangoTea
dd72e37691 Merge remote-tracking branch 'origin/main' 2024-07-04 20:35:13 +02:00
DrMangoTea
b711aa2dc3 0.9.0 2024-07-04 20:08:04 +02:00
DrMangoTea
7c3b41762f 0.9.0 2024-07-04 20:07:35 +02:00
DrMangoTea
d2d65ee2e5 something idk 2024-01-27 20:47:04 +01:00
DrMangoTea
5174a750eb Merge remote-tracking branch 'origin/main' 2024-01-15 20:36:49 +01:00
DrMangoTea
095fb25d96 0.7.0 update :3 2024-01-15 20:36:28 +01:00
DrMangoTea
51c498cad4 Merge pull request #28 from lonevox/add-config
Add stress config
2023-12-19 16:32:58 +01:00
lonevox
057fc487d4 Add stress config
Depends on #26
2023-12-20 00:16:45 +13:00
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