Commit graph

3210 commits

Author SHA1 Message Date
simibubi
c7a75f8ffd Subcontraption Overlap
- Fixes #3871
2022-10-03 00:31:42 +02:00
Cael Warner
0098f0e147
Merge pull request #3860 from Creators-of-Create/mc1.18/basin-recipe-fix
Fixed basin recipes that override Recipe#getRemainingItems
2022-10-01 13:35:12 -07:00
caelwarner
b03aaef5a2
Switched getInputInventory() to availableItems
- Using availableItems instead of getInputInventory() in case an item in the output inventory is being used as an ingredient
- Removed commented code
2022-09-30 15:39:19 -07:00
caelwarner
7f6cf4b4a2
Fixed basin recipes that override Recipe#getRemainingItems
- The output of Recipe#getRemainingItems was being ignored by basin recipes. This could cause duplication of container items
- Created DummyCraftingContainer to allow us to call Recipe#getRemainingItems for CraftingRecipes
2022-09-30 13:38:21 -07:00
simibubi
5303d69bf1 Better guard for Deployer#initHandler
- Addresses #3685
2022-09-29 13:00:33 +02:00
PepperCode1
80ae80b39b Mixing up the mud
- Add mixing recipe for mud
- Add BlockTagIngredient
- Update Flywheel
- Bump version
2022-09-28 22:16:18 -07:00
PepperCode1
be57d096f8 Merge branch 'mc1.18/dev' into mc1.19/dev 2022-09-28 22:14:33 -07:00
PepperCode1
abdeb212e8 Include patch F in bug report template 2022-09-28 20:10:44 -07:00
simibubi
4985a521a4 Overclicked
- Fixed Schematic and Quill selection registering mouse clicks twice
2022-09-28 23:43:09 +02:00
simibubi
c5b144b60c No Comment
- Added "." to empty comments in config files (-> Fixes forge startup crash on 1.19)
2022-09-28 22:28:29 +02:00
PepperCode1
e74bdaa262 Bump network version
- This prevents a client from joining a server if they have different
network versions.
2022-09-27 14:51:36 -07:00
PepperCode1
83a3de8930
Merge pull request #3822 from rbasamoyai/mc1.18/dev
Fix FluidTagIngredient testing null tag
2022-09-25 20:48:20 -07:00
rbasamoyai
e45d12c904
Fix FluidTagIngredient testing null tag 2022-09-25 23:36:15 -04:00
PepperCode1
97906cb4cc Fix Flywheel JiJ version range 2022-09-25 12:34:18 -07:00
PepperCode1
abfb22c396 Reinforced deepslate movement config 2022-09-25 12:29:37 -07:00
PepperCode1
92d05e7498 Merge branch 'mc1.18/dev' into mc1.19/dev
Conflicts:
	src/generated/resources/.cache/cache
	src/generated/resources/assets/create/lang/unfinished/ru_ru.json
	src/generated/resources/assets/create/lang/unfinished/zh_cn.json
2022-09-25 12:26:52 -07:00
PepperCode1
96b76a83a1 Add 1.19 to Github files 2022-09-25 12:07:39 -07:00
PepperCode1
2e838b6e01 Obsidian movement config now controls respawn anchor 2022-09-25 11:56:52 -07:00
simibubi
bb404c3ceb PR Datagen 2022-09-25 20:51:06 +02:00
luffypirat
94578adad5
Updates to ru_ru.json by luffypirat (#3817) 2022-09-25 20:48:28 +02:00
璀境石
916638997d
Updates to zh_cn.json by Demonese (#3814) 2022-09-25 20:47:52 +02:00
simibubi
c774f6b2e1 Update Flywheel 2022-09-25 20:41:39 +02:00
simibubi
95a23f7433 Collision Spike
- Reduced false positives for train/player collisions during lag spikes
2022-09-25 20:41:12 +02:00
simibubi
f009c83529 Port new changes 2022-09-23 23:10:21 +02:00
simibubi
32f72cb614 Merge branch 'mc1.18/dev' into mc1.19/dev 2022-09-23 23:05:45 +02:00
simibubi
1f06034b47 Order of Interact
- Fixed entity-specific interactions causing schedule interaction to be ignored
- Fixed viewport jittering when pressing movement keys while seated
- Fixed players dismounting trains/minecart contraptions causing them to be placed at incorrect locations
2022-09-23 23:04:49 +02:00
simibubi
5bc1fbabee Port new changes 2022-09-23 20:59:38 +02:00
simibubi
2d31364eef Merge branch 'mc1.18/dev' into mc1.19/dev 2022-09-23 20:54:40 +02:00
simibubi
4d4a959cfa Mixing up a Storm
- Reduced tps impact of basin recipe lookups noticeable in larger modpacks
- Fixed Brass tunnels distributing back into the side items get inserted from
- Fixed Brass tunnels distributing into sides blocked by an inserting funnel
- Cargo Conditions in schedules now match any cargo if no filter is specified
2022-09-23 18:40:15 +02:00
PepperCode1
09124ea92b Add config for automated brewing
- Add allowBrewingInMixer config
- Add 0.5.0e to the bug report template
- Allow Flywheel 0.6.6
2022-09-22 12:09:23 -07:00
simibubi
d6ca0343b8 PR Datagen
- Hand cranks, valve handles and smart pipes can now be waterlogged
- Version bumped
2022-09-22 20:10:42 +02:00
simibubi
e6d5048875
Merge pull request #3794 from MoarDm/mc1.18/fix-3786
Fix: Game crash caused by Attribute Filter
2022-09-22 19:47:16 +02:00
simibubi
f6f3a82025
Merge pull request #3793 from MoarDm/mc1.18/fix-3744
Fix: Fluid valve isn't waterloggable
2022-09-22 19:46:36 +02:00
simibubi
c571493ce4 Early Departures
- Fixed "Station Powered" wait condition not working correctly in non-overworld dimensions
2022-09-22 19:24:24 +02:00
simibubi
a4dc6bad54
Merge pull request #3783 from RungeCC/fix_cauldron
fix: lava/water/snowpowder cauldron
2022-09-22 19:03:38 +02:00
simibubi
c2d06edbf6 Merge branch 'mc1.18/dev' of https://github.com/Creators-of-Create/Create into mc1.18/dev 2022-09-22 19:00:39 +02:00
simibubi
d117637df1 Telekinetics
- Fixed Movement Behaviours not resetting state when minecart contraptions are picked up
2022-09-22 19:00:26 +02:00
Andre_601
143b26cab7
Updates to de_de.json by Andre601 (#3777) 2022-09-22 18:43:44 +02:00
simibubi
8fe370bbd5
Merge pull request #3776 from Xstoudi/fix/mechanical-crafter-dup
fix: item duplication bug
2022-09-22 18:40:25 +02:00
435THz
6338d28feb
Updates to it_it.json by 435THz (#3775) 2022-09-22 18:31:49 +02:00
simibubi
59452a44ac Update MaterialChecklist.java 2022-09-22 18:30:42 +02:00
simibubi
ecb40624f4
Merge pull request #3758 from Xstoudi/feat/hover-event
feat: add on hover event in material list
2022-09-22 18:29:33 +02:00
simibubi
01a788b4f7 Update pl_pl.json 2022-09-22 18:26:15 +02:00
Mrucznik
81585a4803
Updates to pl_pl.json by Mrucznik (#3743) 2022-09-22 18:22:56 +02:00
simibubi
a9faf4796f
Merge pull request #3739 from MarioSMB/mc1.18/dev
Add some compatibility recipes for Oh The Biomes You'll Go and Farmer's Delight
2022-09-22 18:21:37 +02:00
luffypirat
46e48b77a4
Updates to ru_ru.json by luffypirat (#3648) 2022-09-22 18:17:01 +02:00
simibubi
e6903a733d Casualty Control
- Attempted to reduce false positives for damage from carriage contraptions
2022-09-22 18:03:15 +02:00
simibubi
eee9c509e3
Merge pull request #3625 from Alex2772/mc1.18/dev
Fixed client-side bobbing animation on contraptions
2022-09-22 16:41:34 +02:00
simibubi
ac6369a276 Flat fence
- Added ai deterrents for crossing track blocks
2022-09-21 10:16:48 +02:00
simibubi
63de196977 My mangrove is to blow up
- Extended saw behaviour to work with mangroves
- Fixed tree fertilizer not working when trees are growing on mud (?)
2022-09-21 09:27:20 +02:00