Commit graph

229 commits

Author SHA1 Message Date
IThundxr
d1c598b388
Fancy abstractions
- Switch to loader agnostic methods provided by catnip
2024-12-16 09:35:42 -05:00
simibubi
f5c0df06a8 Fix build errors
- JEI util classes are only used within the plugin, but must be present for compiling
2024-12-06 10:11:06 +01:00
IThundxr
d92b47d0ef
Box in the vents
- Make the player hitbox smaller when hiding as a box and allow them to go into 1x1 spaces
2024-11-24 11:46:20 -05:00
Jozufozu
71a0a6e28f Twofold bump
- Bump flywheel version to fix visual issues and crashes
2024-11-08 10:25:23 -08:00
zelophed
6f1979df0a adjust block updates from rotation menu
- remove unused ponder keybind
2024-11-08 15:57:19 +01:00
simibubi
f243c6432a Merge branch 'mc1.20.1/feature-dev' into mc1.20.1/high-logistics 2024-10-09 21:19:47 +02:00
simibubi
3af2403d5e Merge branch 'mc1.20.1/dev' into mc1.20.1/feature-dev 2024-10-09 19:11:16 +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
zelophed
ab0ed79ce7 merge changes from 1.20.1/feature-dev 2024-09-18 17:39:38 +02:00
zelophed
d82644bfba fix imports, adjust buildscripts 2024-09-15 02:14:09 +02:00
zelophed
c321202ba0 merge changes from 1.20.1/dev 2024-09-14 13:18:06 +02:00
simibubi
963eabf17b Bugs in the box II 2024-09-06 08:36:41 +02: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
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
879220efb4 Merge remote-tracking branch 'origin/mc1.19/dev' into mc1.20.1/dev 2024-08-11 10:09:46 +02:00
simibubi
6f120fc862 Merge branch 'mc1.18/dev' into mc1.19/dev 2024-08-11 10:09:07 +02:00
IThundxr
653b1e7909
Issue Label Actor (#6221)
* label actor

* Push

* Update bug_report.yml

* update label actor

* fix close issue type

* Update label actions

* Add missing quotes

* Make messages more concise

* Fix typo and improve hybrid server message

---------

Co-authored-by: PepperCode1 <44146161+PepperCode1@users.noreply.github.com>
2024-08-10 12:26:26 -07:00
simibubi
5a11166cf4 Merge remote-tracking branch 'origin/mc1.19/dev' into mc1.20.1/dev 2024-08-08 08:30:24 +02:00
attackeight
6fe9a036f6 More Mod Compat 4
Update compat mods to 1.19
Add windswept support
Add Good Ending Support
Update Forbidden Arcanus support
Add Quark ancient wood
2024-08-07 13:51:12 -04:00
attackeight
ec52c0aa2f More Mod Compat 3
Add Environmental wood support
2024-08-07 11:28:30 -04:00
simibubi
44a2181bb1 E A Ports. It's in the blame
- Port new changes to 1.20.1
2024-08-07 16:42:42 +02:00
simibubi
49030ec91f Merge remote-tracking branch 'origin/mc1.19/dev' into mc1.20.1/dev 2024-08-07 15:39:06 +02:00
simibubi
42b57bdd61 Update framed blocks integration 2024-08-07 10:39:18 +02:00
simibubi
a012194f0f Merge branch 'mc1.18/dev' into mc1.19/dev 2024-08-07 09:07:28 +02:00
simibubi
c66827c43e The Frame Train
- Fixed modded signs getting wiped when moved by contraption or printed in a schematic
- Added schematic compatibility for the mod "framed blocks"
2024-08-06 18:50:20 +02:00
simibubi
d84a7faa6a Merge branch 'pr/6288' into mc1.18/dev 2024-07-25 13:16:38 +02:00
simibubi
b90e11c120 Squashed commit of the following:
commit e398793b887986e730cf6b3c7a9c96861d186591
Author: simibubi <31564874+simibubi@users.noreply.github.com>
Date:   Thu Jul 25 11:00:21 2024 +0200

    Remove duplicate line in buildscript

commit e6a1ebd40332ba649fab968841d7b88cdec51553
Merge: acbe5102c 283998711
Author: simibubi <31564874+simibubi@users.noreply.github.com>
Date:   Thu Jul 25 10:48:13 2024 +0200

    Merge branch 'mc1.18/dev' into pr/6403

commit acbe5102cf4757f75adeb21ebff8b0649e74e2a5
Merge: 4d2c35b11 1038b76d3
Author: simibubi <31564874+simibubi@users.noreply.github.com>
Date:   Thu Jul 18 10:27:51 2024 +0200

    Merge branch 'mc1.18/dev' into pr/6403

commit 4d2c35b11b
Author: attackeight <attackeight@gmail.com>
Date:   Tue Apr 23 15:39:37 2024 -0400

    Re-Activate Dynamic Trees Compat
2024-07-25 11:00:57 +02:00
IThundxr
05c2cbaf73 Flying the wheel away 2024-07-19 21:42:18 -07:00
simibubi
f964e892de Less drains More II
- Fixed Potion buckets from Tinkers Construct not interacting correctly with drains and spouts #6316 #4124 #6415
2024-07-17 12:46:20 +02:00
simibubi
f67341df7e Merge branch 'pr/6467' into mc1.18/dev 2024-07-16 19:03:15 +02:00
attackeight
a5dc53ba5f
Goggle Tooltip code cleanup and ModernUI compat (#6477)
* Goggle Tooltip code cleanup and ModernUI compat
fixes Creators-of-Create#6404

* Calculate indents based on font
thanks @Tidy-Bear

* exactPositioning workaround

---------

Co-authored-by: zelophed <github@zelophed.me>
2024-07-15 17:14:56 +02:00
zelophed
d9198f678e rework ThresholdSwitch compat
- adds better support for SophisticatedStorage and FunctionalStorage
2024-07-15 14:45:23 +02:00
attackeight
7e512a37c7 Move curios tag and upgrade aquatic tree fertilizer recipes to datagen 2024-06-01 07:54:57 -04:00
Jozufozu
ec0350cfba Revving up
- Bump flywheel build
- Bulk replace com.jozufozu -> dev.engine_room
- Optimize imports
2024-05-25 12:25:19 -07:00
PepperCode1
669c748bd1 Fully fix unshaded geometry in SBBs 2024-05-21 17:22:47 -07:00
Jozufozu
0d324ffdf9 Simply implless
- Use split api/runtime flywheel jars
- Update instance types to use single packed light int
- Update visuals to use new context location
2024-05-20 21:31:55 -07:00
attackeight
4e51df3f81 Guard against chunk protections 2024-05-09 16:21:11 -04:00
attackeight
60c001696a Add Ex Nihilo: Sequentia compat 2024-04-26 16:55:33 -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
5277d5971d
Merge branch 'Creators-of-Create:mc1.18/dev' into mc1.18/mmc-1 2024-04-15 20:41:14 -04:00
Jozufozu
633a7abc23 Exit stage right
- Update to implicit render stage API.
- Fix bounding sphere transformers.
- Bump flywheel version.
- Update flywheel mixin config jsons.
2024-04-02 19:23:13 -07:00
Jozufozu
5038d04ac4 Pretty rad
- Bump flywheel build.
- Fix all(?) places where radians methods were passed degrees
- Add DiffuseLightCalculator.
- Add overlay to belt and rotating types.
- Use joml quaternions in instance types.
2024-04-02 19:23:13 -07:00
Jozufozu
d925d697cc Sweeping things under the rug
- Comment out some stuff to get it to compile.
- Pull in ModelUtil virtual stuffs from old flywheel.
- Update build.gradle to always download sources/javadoc in IDEA.
2024-04-02 19:23:13 -07:00
Jozufozu
6d9587b463 Doesn't build script
- Update buildscript/gradlew and bump flywheel version
2024-04-02 19:23:12 -07: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
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
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