mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2025-01-13 07:47:21 +01:00
Code Issues Projects Releases Packages Wiki Activity
3974 commits 31 branches 14 tags 109 MiB
Commit graph

3974 commits

This branch
This branch
All branches
Author SHA1 Message Date
simibubi
1935b790dd Merge branch 'mc1.20.1/0.5.1' into mc1.20.1/dev 2024-10-23 22:26:15 +02:00
simibubi
d39f89983a
Merge pull request #6952 from IThundxr/mc1.18/fluidstack-ingredient-crash-fix 
Better FluidIngredient exception handling
 2024-10-23 21:53:31 +02:00
IThundxr
a624a6e452
Fix crash when empty fluids are specified 2024-10-23 15:52:20 -04:00
simibubi
b7f272cad7 #7086 on 0.5.1 
- Fix in-portal trains sometimes loading in with invalid coordinates, causing a game crash
 2024-10-23 21:45:24 +02:00
simibubi
ed875d47ac More like ne-oldforge 
- Forge -> 47.1.3
- Restore neoforge compatibility #7049
- Add a deployer safety check #6244
- Fluid tank lighting safety checks #7073
- Fixed PSI not always connecting on assembly #6854
 2024-10-23 21:29:12 +02:00
PepperCode1
03a94dd74d Refactor bogey rendering 2024-10-19 16:18:54 -07:00
Jozufozu
eb2f1fecdc Recycling rope 
- Bump flywheel version
- Fix rope pulleys being invisible
- Use an InstanceRecycler in AbstractPulleyVisual
- Remove Select, Group, and ConditionalInstance
 2024-10-12 16:11:58 -07:00
Jozufozu
b6da803886 On track to stability 
- Fix track visuals not appearing when first placed
- Fix blaze burner's heads appearing at 0,0,0 until you look at them
- Bump flywheel version to fix crash when breaking blocks
 2024-10-12 15:41:33 -07:00
Jozufozu
cdc41b18cc Rolling over a bump 
- Bump flywheel version
- Make all visuals use instancerProvider() method
- Fix ModelCache usage
- Use PosedInstance in BogeyRenderer
 2024-10-12 15:41:10 -07:00
simibubi
cafd877802 Te hee 2024-10-09 18:38:00 +02:00
simibubi
7d1a3866ae Squashed commit of the following: 
commit 8ca03ded64
Author: simibubi <31564874+simibubi@users.noreply.github.com>
Date:   Tue Sep 3 14:10:40 2024 +0200

    Hell on Overworld

    - Fixed incorrect dimension data in train map sync

commit 86ceb9e954
Merge: 97205a7d5 b6856bda8
Author: simibubi <31564874+simibubi@users.noreply.github.com>
Date:   Tue Sep 3 12:58:34 2024 +0200

    Merge branch 'mc1.20.1/dev' into mc1.20.1/train_map_integration

commit 97205a7d51
Author: simibubi <31564874+simibubi@users.noreply.github.com>
Date:   Tue Sep 3 12:58:02 2024 +0200

    Tube map

    - Added fullscreen map integration for FTB Chunks and Journeymap
 2024-10-09 18:25:24 +02:00
simibubi
bcad4bfeaa Merge branch 'mc1.20.1/0.5.1' into mc1.20.1/dev 2024-10-09 18:15:19 +02:00
simibubi
51bb416b0e Update mods.toml 2024-10-09 14:15:58 +02:00
simibubi
f0b8e49d1d Mirror, Mirror on the Vault 
- Vaults and tanks no longer multi-place when a symmetry wand is active
 2024-10-09 12:59:46 +02:00
simibubi
3c92ace8eb Datagen 2024-10-09 12:33:34 +02:00
simibubi
03f2f95aaa Merge remote-tracking branch 'origin/mc1.19/dev' into mc1.20.1/0.5.1 2024-10-09 12:22:29 +02:00
simibubi
bc9906dc15 Merge branch 'mc1.18/dev' into mc1.19/dev 2024-10-09 12:10:59 +02:00
simibubi
bc1ad5f52d Datagen 2024-10-09 12:07:19 +02:00
simibubi
285a25cf08 Merge branch 'mc1.18/dev' into mc1.19/dev 2024-10-09 12:00:03 +02:00
simibubi
2828c88d80 Multiblock Madness 
- Fixed moving single-tile tanks and vaults leading to corrupt nbt #6915 #6925 #6943 #6979
- Display links now check for click events in transferred components #6942
- Fixed negative values displayed on kinetic generator goggle overlay
 2024-10-09 01:17:27 +02:00
simibubi
e8063acf69 Merge branch 'mc1.20.1/0.5.1' of https://github.com/Creators-of-Create/Create into mc1.20.1/0.5.1 2024-10-08 18:34:11 +02:00
simibubi
5b99b61abb
Merge pull request #7031 from IThundxr/mc1.20.1/fix-memory-leak 
Fix memory leak with CapManipulationBehaviourBase
 2024-10-08 18:33:37 +02:00
simibubi
007c086c9b
Merge pull request #7001 from IThundxr/mc1.20.1/fix-botania-compat 
Add load conditions for botania compat recipes
 2024-10-08 18:31:57 +02:00
simibubi
4c802969e6
Merge pull request #7039 from IThundxr/mc1.20.1/aquatic-recipe-fix 
Fix UA recipes not having conditions
 2024-10-08 18:31:19 +02:00
IThundxr
9dba97761c
Add load conditions for botania compat recipes 2024-10-08 12:23:48 -04:00
IThundxr
b78688e944
Fix memory leak with CapManipulationBehaviourBase 
Fixes #7023
 2024-10-08 12:23:10 -04:00
IThundxr
f9d814a053
Conditions for all! 
- Add ICondition support to shapeless recipes in StandardRecipeGen
- Fixes #7021
 2024-10-08 12:21:39 -04:00
simibubi
240f661913 Bringing the Cheat, part II 
- Fixed signs retaining itemstack data in schematics when the mod "Amendments" is installed #6961
 2024-10-08 18:08:02 +02:00
simibubi
f51c99e715
Merge pull request #6898 from IThundxr/mc1.20.1/ponder-culling-fix 
fix: items in ponders being culled incorrectly
 2024-10-08 18:01:53 +02:00
simibubi
7c2a40e8c7
Merge pull request #6929 from EliteTK/fix-invisible-elevator-doors 
Fix #5417
 2024-10-08 17:55:31 +02:00
simibubi
034babf125 I have so much to show you 
- Prevent basins from endlessly queueing up particle information when no players are near #6837
 2024-10-08 17:11:56 +02:00
simibubi
8e50ad4cfd Stack of Spades 
- Protect item handlers against invalid item stack sizes
- Fix some held or dropped items not updating count when inserted into item handlers
 2024-10-08 16:43:50 +02:00
simibubi
a99f05d8b0 Toolbugs 
- Attempt to improve handling of toolbox storage on contraptions #6940
 2024-10-08 15:56:13 +02:00
simibubi
8f5c91c195 I 2 didn't C the 'i' in that id 
- Fixed incorrect IC2 compatibility recipes #6917 #6916
 2024-10-08 13:22:12 +02:00
simibubi
5905e8bc93 Bringing the Cheat 
- Clipboards now validate their data item #6928
- Backport #6911
 2024-10-08 12:48:36 +02:00
simibubi
4d466efe80
Merge pull request #6953 from IThundxr/mc1.18/clipboard-fix 
Remove unsafe nbt KVs from blocks aswell
 2024-10-07 16:37:37 +02:00
simibubi
1dc32f94e7
Merge pull request #6911 from IThundxr/mc1.20.1/deployer-fix 
Fix deployers not replacing replacable blocks like water
 2024-10-07 16:35:40 +02:00
IThundxr
84911a3de5
Fix #6906 2024-09-18 15:42:25 -04:00
IThundxr
c59c749ed5
fix: items in ponders being culled incorrectly 
- Items shouldn't be culled in ponder worlds, the cullingFrustum is wrong and ponders are unpredictable
 2024-09-18 15:18:57 -04:00
IThundxr
ac61d249cc
fix blocks having unsafe nbt values 2024-09-16 17:29:10 -04:00
Tomasz Kramkowski
4b59528b31 Fix race in Contraption simplifiedEntityColliders update 
This issue is most obvious in elevators with multiple doors. When the
collider gets invalidated multiple times in quick succession, multiple
futures are created. If a future which was started before all door state
updates were finalized completed after all other futures, the final
simplifiedEntityColliders would be outdated and invalid (containing
ghost doors, or in the case of an elevator in motion, missing door
collisions).

This commit addresses this issue in two ways:

First by cancelling any existing future to ensure that any future which
completes was started after the most recent invalidation.

Second by removing the null assignment of
simplifiedEntityColliderProvider from the future. This prevents the
future from becoming null after a null check and before a cancellation
(the only time where the null value matters). Cancelling a future twice
is not an issue so there's no need to track if the future is null other
than to avoid a null dereference.
 2024-09-11 00:23:14 +01:00
Jozufozu
aa15182005 Merge remote-tracking branch 'origin/mc1.20.1/dev' into mc1.20.1/dev 2024-09-03 12:45:18 -05:00
Jozufozu
14c93e590c Merge branch 'mc1.20.1/flywheel-upgrade' into mc1.20.1/dev 
# Conflicts:
#	build.gradle
#	gradle.properties
#	src/main/java/com/simibubi/create/content/contraptions/actors/roller/RollerMovementBehaviour.java
#	src/main/java/com/simibubi/create/content/fluids/drain/ItemDrainRenderer.java
#	src/main/java/com/simibubi/create/content/kinetics/belt/BeltRenderer.java
#	src/main/java/com/simibubi/create/content/kinetics/mechanicalArm/ArmRenderer.java
#	src/main/java/com/simibubi/create/content/kinetics/waterwheel/WaterWheelRenderer.java
#	src/main/java/com/simibubi/create/content/trains/schedule/hat/TrainHatArmorLayer.java
#	src/main/resources/META-INF/mods.toml
#	src/main/resources/create.mixins.json
 2024-09-03 12:44:26 -05:00
simibubi
ad3778e0c4 Moving on 2024-09-03 18:37:56 +02:00
simibubi
e3331d363d Merge remote-tracking branch 'origin/mc1.19/dev' into mc1.20.1/dev 2024-09-03 15:44:12 +02:00
simibubi
2e6d114cfd Merge branch 'mc1.18/dev' into mc1.19/dev 2024-09-03 15:42:39 +02:00
simibubi
11787d845f Update jij version range, Patch H 2024-09-03 15:39:36 +02:00
simibubi
b6856bda86
Update localization.yml 2024-09-03 10:02:03 +02:00
simibubi
8ec724d9df Merge remote-tracking branch 'origin/mc1.19/dev' into mc1.20.1/dev 2024-09-03 00:02:38 +02:00
simibubi
9ecfe6bd6f Merge branch 'mc1.18/dev' into mc1.19/dev 2024-09-03 00:00:51 +02:00