Commit graph

243 commits

Author SHA1 Message Date
IThundxr
2e40bb296c
Temp disable 2025-02-28 19:25:15 -05:00
zelophed
8fdb2326d0 maven prep 2025-02-27 17:45:25 +01:00
IThundxr
89ba8a76bc
CoreModn't 2025-02-21 16:42:07 -05:00
Jozufozu
5cc77c6d2a Making room
- Move to createmod maven Flywheel
2025-01-26 17:48:43 -08:00
IThundxr
664a7fa954
Old days
- Fix forge bundling an old version of ponder
2025-01-18 21:04:54 -05:00
zelophed
2141e69aa2 Merge remote-tracking branch 'origin/mc1.20.1/feature-dev' into mc1.20.1/merge-catnip
# Conflicts:
#	build.gradle
#	src/main/java/com/simibubi/create/AllPartialModels.java
#	src/main/java/com/simibubi/create/content/kinetics/base/ShaftVisual.java
#	src/main/java/com/simibubi/create/content/kinetics/base/SingleRotatingVisual.java
#	src/main/java/com/simibubi/create/content/kinetics/crank/HandCrankVisual.java
#	src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerActorVisual.java
#	src/main/java/com/simibubi/create/content/kinetics/fan/processing/AllFanProcessingTypes.java
#	src/main/java/com/simibubi/create/content/kinetics/flywheel/FlywheelVisual.java
#	src/main/java/com/simibubi/create/content/kinetics/saw/SawVisual.java
#	src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelModel.java
2025-01-18 15:04:48 +01:00
zelophed
3fb6e71ec8 remove references to catnip as a mod 2025-01-17 14:52:52 +01:00
Jozufozu
efedee7d48 Confused diffuse
- Fix bottom of chain conveyor guards not matching the bottom of chain
  conveyors
- Bump flywheel build, add vanillin at runtime
2025-01-16 12:18:45 -08:00
IThundxr
28ca976cd4
Cat in the box 2025-01-14 14:10:52 -05:00
IThundxr
e86b080017
What a bad mix up
- Fix accessors by removing and replacing with method handles/AT's
2025-01-14 11:54:09 -05:00
IThundxr
a70ab4ef63
Refmap Referee
- Fix refmap not being remapped
2025-01-12 18:05:58 -05:00
IThundxr
fdc069910c
Mixed up errors
- Fix
2025-01-12 17:46:01 -05:00
IThundxr
88907795fe
Elephant taming
- Enable parallel and caching args
- Modify tasks to support configuration cache
2025-01-12 16:23:40 -05:00
IThundxr
a962ade027
A new era
- Switch to MDG instead of using FG
- Implement CI-based mod publishing
- Embed commit hash into the built jar
- Log commit hash
2025-01-12 16:06:44 -05:00
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