Commit graph

3676 commits

Author SHA1 Message Date
VoidLeech
ab4c29bc40
Switch conditions in getRequiredHeldItem and getProcessedItem 2024-04-29 16:27:57 +02:00
attackeight
eadb3608d8 Merge remote-tracking branch 'origin/mc1.18/mmc-1' into mc1.18/mmc-1
# Conflicts:
#	build.gradle
2024-04-26 16:56:05 -04:00
attackeight
60c001696a Add Ex Nihilo: Sequentia compat 2024-04-26 16:55:33 -04:00
attackeight
776c41ca84 Add Ex Nihilo: Sequentia compat 2024-04-26 16:54:59 -04:00
VoidLeech
12bf210f55
Fix filters ignoring 'respect data' option 2024-04-24 16:25:36 +02:00
attackeight
971fae9c0e Allow Ponder to be re-bound 2024-04-17 21:22:16 -04:00
attackeight
5b1b8f22b0 Respect Manual Only Recipes
The following recipes will now respect the "_manual_only" recipe suffix
 - Sandpaper Polishing (Deploying)
 - Item Application (Deploying)
 - Smelting (Fan Blasting)
 - Smoking (Fan Smoking)
 - Blasting (Fan Blasting)
fixes Creators-Of-Create#5164
2024-04-17 19:15:47 -04:00
attackeight
53a483dde2 Accidentally forgot to comment these out 2024-04-16 21:04:01 -04:00
attackeight
79aea176f3 Ice and Fire Dragons Compat
- Silver Ingots
2024-04-15 22:15:31 -04:00
attackeight
dcfcf9e896 Merge remote-tracking branch 'origin/mc1.18/snowtoice' into mc1.18/snowtoice
# Conflicts:
#	src/generated/resources/.cache/cache
#	src/generated/resources/data/create/recipes/emptying/compat/alexsmobs/lava_bottle.json
2024-04-15 21:10:34 -04:00
attack8
4201a184a9 Add Ice Compacting Recipe and runData 2024-04-15 21:09:27 -04:00
attackeight
5277d5971d
Merge branch 'Creators-of-Create:mc1.18/dev' into mc1.18/mmc-1 2024-04-15 20:41:14 -04:00
IThundxr
b7bc7bc757
Allow big outlines in y axis 2024-04-06 19:39:41 -04:00
Star
d00517282a Minor ClipboardCloneable outline renderer oversight 2024-04-04 22:25:20 -04:00
JensenJ
a9ec38d5e5
Merge branch 'Creators-of-Create:mc1.18/dev' into mc1.18/dev 2024-03-31 20:43:19 +01:00
IThundxr
d66170c8fe
fix: Schematicannon request wrong blocks (#5830)
* fix: schematics request tall grass block which is unobtainable (#5814)

* fix: give large ferns the same treatment

* remove unused imports

* comments

* fix requirement for farmers delight rich soil
2024-03-22 14:45:41 +01:00
Jay Turner
efb3cf490d
Add null-safety check on usage of BlockEntity.loadStatic (#6224) 2024-03-22 14:38:56 +01:00
attackeight
6802a1316b
Respect 'eternal' modifier from Forbidden and Arcanus in Deployer Recipes (#6231)
- We Could be Immortal
 - Fixes Creators-of-Create#6220
2024-03-22 14:35:10 +01:00
IThundxr
51db53c74f
Fix Copycat step placement helper (#6267) 2024-03-22 14:27:35 +01:00
IThundxr
41f957a94d
Fix changing bogey style not updating the block properly (#6273)
* Fix bogey block's placing the wrong block

* Clean the code up a bit

* Fix bitflag
2024-03-22 14:23:20 +01:00
IThundxr
7d3d4a1e7c
feat: Track Placement breaks flowers (#5821)
* feat: tracks break flowers during placement

* chore: cleanup import
2024-03-21 12:09:24 +01:00
attack8
a15d7c5569 More Mod Compat 1
- Add Galosphere stone recipes like the Create stones
 - Add Elementary Ores compat
 - Add Infernal Expansion path pressing recipes
2024-03-19 20:13:45 -04:00
Jensen
9072693c0e Versioned Inventories for funnel input
(cherry picked from commit c8357b2d6ee6215d5d35ec74dd20f71b829c1811)
2024-03-19 05:30:15 +00:00
attack8
612f9f5efa Add Ice Compacting Recipe and runData 2024-03-18 16:16:08 -04:00
attackeight
f551107e6d
Move compat recipies to datagen (#5095)
* Separate config options for placing source blocks
placeFluidSourceBlocks ->
     fluidFillingPlaceFluidSourceBlocks
     pipesPlaceFluidSourceBlocks

* Add IC2 Metals compat

* Compat Datagen, pt 1

* Add IC2 Metals compat

* Compat Datagen, pt 1

* All Compat Recipes moved to datagen

* Add Oreganized and Galosphere compat

* Update HexCasting Compat

* Add The Vault Compat

* Add The Vault Compat

* Fix dupe bug added by last commit

* adding some wood missed previously

* add Nether's Exoticism Compat

* Update Mods.java

Remove duplicate enum entry

* Update CuttingRecipeGen.java

Reflect Mods.java update

* Update MillingRecipeGen.java

Reflect Mods.java changes

* Update PressingRecipeGen.java

Reflect Mods.java changes

* Update WashingRecipeGen.java

Reflect Mods.java changes

* Ok it's actually correct now

---------

Co-authored-by: NerdsOfAFeather <ftcteam18218@gmail.com>
2024-03-17 00:40:05 +01:00
zelophed
92975231d7 fix sugarcane acting as logs with mechanical saws
- prevent trees adjacent to sugar cane or similar blocks from being cut by the mechanical saw unintentionally
2024-03-17 00:22:01 +01:00
IThundxr
c4098b31b2
feat: Allow changing the goggle overlay tooltip icon (#5900)
* feat: allow changing the goggle overlay tooltip icon

* change method name
2024-03-16 19:31:05 +01:00
IThundxr
8ffc4ef96a
Fix deployer anti agro not working, and switch away from deprecated event (#6072)
* Fix agro, switch to non deprecated event as well

* spaces -> tabs
2024-03-16 19:18:07 +01:00
attackeight
866b619767
Add Unique Vertical Gearbox Crafting Recipe (#6171) 2024-03-16 19:13:55 +01:00
IThundxr
d9d4967100
Big Outlines API (#6187)
* Big Outlines API

* some more javadoc

* Has -> Have
2024-03-16 19:07:14 +01:00
IThundxr
298d1c1814
Fix #5998, Configs with the same key 2024-03-16 19:04:25 +01:00
IThundxr
2a5935db61
Make roller account for custom tracks 2024-03-16 18:56:18 +01:00
zelophed
04d1a53846 Support custom tooltip component heights in goggle overlay 2024-03-16 17:48:34 +01:00
IThundxr
5df8ed963e
small change: add Create's icon to .idea for intellij users (#5941) 2024-03-16 17:39:39 +01:00
Starlotte
b25b88c772
Add & implement spout & clipboard sfx (#5916)
* Add & implement spout sfx

* Add Clipboard Sounds

* Implement Clipboard Sounds

* Fix formatting for new sounds

---------

Co-authored-by: Starlotte <65743811+Starlotte@users.noreply.github.com>
2024-03-16 17:38:04 +01:00
cakeGit
3eece900aa
Merge branch 'Creators-of-Create:mc1.18/dev' into patch-2 2024-03-16 16:37:37 +00:00
IThundxr
5adb835502
Fix chromatic compound not working under y0 (#6227)
* Fix chromatic compound not working under y 0

* Switch away from constant
2024-03-16 09:27:18 -07:00
Max Mielke
bb7e835a8d
Merge pull request #5826 from IThundxr/mc1.18/fixSignalNPE
fix: Signal Group NPE
2024-03-16 17:20:44 +01:00
Max Mielke
cbaab918ae
Merge pull request #5772 from IThundxr/mc1.18/track-advancement-fix
feat: Make "A New Gauge" Advancement check for AllItemTags#TRACKS
2024-03-16 17:05:50 +01:00
Max Mielke
4294d74144
Merge pull request #5707 from homok43/mc1.18/dev
Memory leak in CapManipulationBehaviourBase
2024-03-16 16:59:32 +01:00
IThundxr
7800328bbd
remove unused imports 2024-03-05 15:33:45 -05:00
drwoops
757f4e2699 restore the invariant that draining is the inverse of filling 2024-02-19 10:37:56 +01:00
cakeGit
378e970005 Added station blockstate check 2024-02-07 20:12:41 +00:00
cakeGit
ffd605f8ac
Added missing whitespace 2024-02-03 12:56:37 +00:00
IThundxr
d62774ff65
Fix #4880 2024-02-02 19:23:36 -05:00
VoidLeech
aa479c56fe Make automated brewing of modded potions use the same fluid amount as vanilla recipes 2023-12-12 20:01:47 +01:00
VoidLeech
c707fbd448 Fix modded potion recipes using uncraftable potion in automated brewing 2023-12-12 19:53:57 +01:00
IThundxr
ff4eb581fc
Merge branch 'Creators-of-Create:mc1.18/dev' into mc1.18/fixSignalNPE 2023-11-30 09:24:52 -05:00
IThundxr
fbc62d4ba2
fix: signal group NPE 2023-11-30 09:22:58 -05:00
IThundxr
a6079ff9af
feat: Make "A New Gauge" Advancement check for AllItemTags#TRACKS 2023-11-19 14:44:35 -05:00