Commit graph

270 commits

Author SHA1 Message Date
attackeight
00291555df
Merge branch 'mc1.20.1/dev' into mc1.20.1/mmc-7 2025-03-02 18:34:05 -05:00
IThundxr
41b6028c0b
Preferred ranges 2025-03-02 16:26:46 -05:00
IThundxr
b9127a52fb
Messy Mixins
- Fix mixin conflict with imm portals
2025-03-02 14:35:08 -05:00
IThundxr
bc335ddc0d
Opposite day
- Strict actually means "Bundle anything between that range, and preferably the newest"
2025-03-02 13:55:32 -05:00
IThundxr
77066b8971
Fix publishing version & re-enable cf publishing 2025-03-02 08:04:33 -05:00
TropheusJ
cda89da9ca better fix for InventorySorter compat 2025-03-01 19:55:49 -05:00
IThundxr
93f268419b
Fix heavy boots 2025-03-01 15:22:07 -05:00
IThundxr
c5d9e06779
Slim jars III 2025-03-01 14:45:30 -05:00
IThundxr
bb39ed0fba
Slim jars II 2025-03-01 14:34:55 -05:00
IThundxr
b3cf357dbb
Slim jars 2025-03-01 14:06:37 -05:00
IThundxr
4dcdc6c373
Merge remote-tracking branch 'concealed/mc1.20.1/feature-dev' into mc1.20.1/dev
# Conflicts:
#	gradle.properties
2025-03-01 14:02:25 -05:00
IThundxr
da87ecb952
Chaotic day
- Publish slim jars
- Allow cardboard swords to damage other arthropods
- Update flywheel
- Fix players getting forced into swim mode when using diving boots
- Fix crash with re-packagers and stock links
- Optional dep updates
2025-03-01 14:01:18 -05:00
IThundxr
a89b582ae3
Morning fixes
- Fix upload task not uploading the reobf'd jar
- Fix debug info not translating the graphics mode text
- Fix crash with factory gauges
- Mark getQueuedPromises as @Nullable
2025-03-01 07:54:34 -05:00
attack8
c1c817825d Merge branch 'refs/heads/mc1.20.1/dev' into mc1.20.1/mmc-6 2025-03-01 00:08:29 -05:00
IThundxr
e431324f98
Fix publishing to maven 2025-02-28 21:27:18 -05:00
IThundxr
2e40bb296c
Temp disable 2025-02-28 19:25:15 -05:00
IThundxr
9a41f8991f
Update displayName 2025-02-28 11:19:45 -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
Jozufozu
7e49954aa5 Fledgling wheel
- Bump flywheel and ponder versions
- Fix renamed model builder reference
2025-02-27 21:26:46 -08: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
attack8
bcdce73cff Post review changes 2025-02-12 21:59:09 -05:00
attack8
199e88c03e More Mod Compat 6
- Update BYG/BWG compat (closes #7193)
2025-01-29 21:05:23 -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
attackeight
769e41d1e6
Merge branch 'mc1.20.1/dev' into mc1.20.1/mmc-5 2025-01-12 21:07:19 -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
b3662c45f4
Fix backtanks getting incompatible enchants via smithing tables (#7057) 2025-01-10 12:10:45 -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
attackeight
8db1c0268d Fix Silent Gems compat 2024-09-06 15:15:33 -04:00
simibubi
963eabf17b Bugs in the box II 2024-09-06 08:36:41 +02:00