Commit graph

4807 commits

Author SHA1 Message Date
IThundxr
004917cafd
Merge remote-tracking branch 'origin/mc1.20.1/feature-dev' into mc1.21.1/dev 2025-02-28 11:17:08 -05:00
IThundxr
e5e14483af
Merge remote-tracking branch 'concealed/mc1.20.1/feature-dev' into mc1.20.1/feature-dev 2025-02-28 11:15:52 -05:00
IThundxr
447c8f0a36
Comment out cf publishing 2025-02-28 11:15:01 -05:00
simibubi
c1f98351aa Build a jar 2025-02-28 17:05:48 +01:00
IThundxr
9f07ac4ca0
Merge remote-tracking branch 'concealed/mc1.21.1/dev' into mc1.21.1/dev 2025-02-28 07:16:19 -05:00
IThundxr
c23db770dc
The wheel stares back 2025-02-28 07:16:11 -05:00
simibubi
decb2e7e3a Port new changes 2025-02-28 11:51:52 +01:00
simibubi
59985dc1e8 Merge remote-tracking branch 'origin/mc1.20.1/feature-dev' into mc1.21.1/dev 2025-02-28 11:40:05 +01:00
simibubi
5ed96e6d34 Third wheels
- Fix bogey wheels rendering twice
2025-02-28 11:12:36 +01:00
simibubi
a8a160c666 Frame perfect
- Re-enable AO on fluid pipes to restore smooth lighting on them
- Boost sounds in stock keeper screen
- Tweak item frame transforms of creates components
2025-02-28 10:57:08 +01:00
TropheusJ
b67842105d move default BlockSpoutingBehaviours out of API 2025-02-28 01:09:07 -05:00
PepperCode1
4cfffe3bde Use existing model data map when buffering contraption structure 2025-02-27 22:07:09 -08:00
Jozufozu
7e49954aa5 Fledgling wheel
- Bump flywheel and ponder versions
- Fix renamed model builder reference
2025-02-27 21:26:46 -08:00
IThundxr
653d17e09c
Held registries 2025-02-27 19:21:52 -05:00
IThundxr
881cda5bb6
Merge branch 'mc1.20.1/feature-dev' into mc1.21.1/dev
# Conflicts:
#	gradle.properties
2025-02-27 19:06:16 -05:00
IThundxr
8802f23b36
Dependencies++ 2025-02-27 18:21:08 -05:00
IThundxr
bcb571a017
Merge remote-tracking branch 'origin/mc1.20.1/feature-dev' into mc1.21.1/dev
# Conflicts:
#	src/main/java/com/simibubi/create/api/contraption/storage/item/MountedItemStorageType.java
2025-02-27 14:06:52 -05:00
IThundxr
b29acf823b
Java 2021 2025-02-27 14:03:55 -05:00
TropheusJ
2681a34f22 use IntrinsicHolderTagsProvider 2025-02-27 12:18:59 -05:00
zelophed
40e1a30d83 maven prep 2025-02-27 18:03:05 +01:00
zelophed
4be32acee9 Merge remote-tracking branch 'origin/mc1.20.1/feature-dev' into mc1.21.1/dev 2025-02-27 18:01:52 +01:00
simibubi
862708f54b Update PackagerBlockEntity.java 2025-02-27 18:00:33 +01:00
zelophed
8fdb2326d0 maven prep 2025-02-27 17:45:25 +01:00
simibubi
10be63ab1a Merge remote-tracking branch 'origin/mc1.20.1/feature-dev' into mc1.21.1/dev 2025-02-27 16:52:39 +01:00
simibubi
e367be9d70 Fix typo 2025-02-27 16:49:26 +01:00
simibubi
dbc4754ca4 bump neoforge and run data 2025-02-27 16:20:06 +01:00
simibubi
c08725d02e Merge remote-tracking branch 'origin/mc1.20.1/feature-dev' into mc1.21.1/dev 2025-02-27 16:05:56 +01:00
simibubi
25a420aea7 Once is plenty, innit 2025-02-27 16:02:03 +01:00
IThundxr
aa8f73aea1
Merge branch 'mc1.20.1/feature-dev' into mc1.21.1/dev
# Conflicts:
#	src/main/java/com/simibubi/create/infrastructure/data/CreateContraptionTypeTagsProvider.java
2025-02-26 16:34:19 -05:00
IThundxr
ccf3f17434
Merge branch 'mc1.20.1/feature-dev' into mc1.21.1/dev 2025-02-26 16:33:38 -05:00
IThundxr
9d0b5b7cd5
Tags 2025-02-26 16:05:50 -05:00
Kryppers
d821f11b32 Merge branch 'mc1.20.1/feature-dev' of https://github.com/Creators-of-Create/Create-Concealed into mc1.20.1/feature-dev 2025-02-26 17:40:23 +00:00
Kryppers
f460383f39 Window cleaning
updated textures for a few wooden window blocks.
2025-02-26 17:40:20 +00:00
IThundxr
8e8cea6661
Vanilla flavored 2025-02-26 11:44:37 -05:00
TropheusJ
735b8b1bcb add my refactors to the changelog
also fixed another of thunder's skill issue typos
2025-02-25 20:08:26 -05:00
TropheusJ
f224099c76 change not_harvestable to non_harvestable for consistency 2025-02-25 19:54:09 -05:00
TropheusJ
fbbed0893e clamp progress just in case 2025-02-25 19:22:52 -05:00
TropheusJ
db6d1fdcf9 tests for refactored features 2025-02-25 15:41:49 -05:00
TropheusJ
97aa549307 add tag for non-harvestable blocks 2025-02-25 02:18:05 -05:00
PepperCode1
ac20501426 More work on potato cannon projectile types 2025-02-24 16:41:34 -08:00
simibubi
8dd17cf7c2 Froptics
- Frogports can now be equipped with goggles
- Fixed frogports playing the open animation twice when not catching a package successfully
2025-02-24 23:18:25 +01:00
IThundxr
48e8723fcd
Potato Power 2025-02-24 11:49:42 -05:00
Kryppers
ca2a6ed67c conveyor collisions
tweaked the conveyor wheel model to prevent z fighting with girders
2025-02-24 12:25:54 +00:00
simibubi
fbc3ce58a2 datagen 2025-02-24 13:00:22 +01:00
simibubi
8b2bd203d0 Tech service
- Stock keeper categories with no filter item now get removed
- Stock keeper ui now plays a sound when showing or hiding a category
- Fixed table cloth price jumping to 64 when set to 1
- Reset alpha on gl shader color after rendering schematic tool bar
- Contained Spawn eggs are no longer listed in the package item tooltip
- Smart observers now trigger when a targeted conveyor has looping packages
- Added a dedicated display source to smart observers for reading package addresses
(datagen pending)
2025-02-24 12:14:33 +01:00
IThundxr
3e10dbe4bc
Perfect soup II 2025-02-23 21:48:00 -05:00
IThundxr
e7e1b2cd61
Merge branch 'mc1.20.1/feature-dev' into mc1.21.1/dev 2025-02-23 21:19:00 -05:00
IThundxr
20491b3caa
Perfect soup 2025-02-23 21:18:39 -05:00
IThundxr
052dc90bfe
Merge branch 'mc1.20.1/feature-dev' into mc1.21.1/dev 2025-02-23 21:05:45 -05:00
IThundxr
a50fb9dac0
Convert Potato Cannon projectile types into a dynamic registry (#19) 2025-02-23 20:07:54 -05:00