IThundxr
61e08b13a2
Merge branch 'mc1.20.1/feature-dev' into mc1.21.1/dev
2025-01-28 15:28:51 -05:00
IThundxr
667a252f4e
Merge branch 'mc1.20.1/feature-dev' into mc1.21.1/dev
...
# Conflicts:
# build.gradle
# gradle.properties
# src/generated/resources/.cache/3055aa55530438925fbff1670d3e8dc6cc209bf3
# src/generated/resources/data/create/recipe/milling/cactus.json
# src/generated/resources/data/create/tags/block/sugar_cane_variants.json
# src/generated/resources/data/minecraft/tags/block/combination_step_sound_blocks.json
# src/generated/resources/data/minecraft/tags/block/inside_step_sound_blocks.json
# src/main/java/com/simibubi/create/AllBlocks.java
# src/main/java/com/simibubi/create/api/equipment/goggles/IHaveGoggleInformation.java
# src/main/java/com/simibubi/create/compat/Mods.java
# src/main/java/com/simibubi/create/compat/jei/CreateJEI.java
# src/main/java/com/simibubi/create/compat/jei/category/BasinCategory.java
# src/main/java/com/simibubi/create/compat/jei/category/CreateRecipeCategory.java
# src/main/java/com/simibubi/create/compat/jei/category/ItemDrainCategory.java
# src/main/java/com/simibubi/create/compat/jei/category/SpoutCategory.java
# src/main/java/com/simibubi/create/compat/jei/category/sequencedAssembly/SequencedAssemblySubCategory.java
# src/main/java/com/simibubi/create/content/equipment/armor/BacktankBlock.java
# src/main/java/com/simibubi/create/content/equipment/armor/BacktankBlockEntity.java
# src/main/java/com/simibubi/create/content/equipment/goggles/GoggleOverlayRenderer.java
# src/main/java/com/simibubi/create/content/equipment/tool/CardboardSwordItem.java
# src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxBlock.java
# src/main/java/com/simibubi/create/content/fluids/drain/ItemDrainBlockEntity.java
# src/main/java/com/simibubi/create/content/fluids/potion/PotionFluid.java
# src/main/java/com/simibubi/create/content/fluids/potion/PotionFluidHandler.java
# src/main/java/com/simibubi/create/content/fluids/spout/SpoutBlockEntity.java
# src/main/java/com/simibubi/create/content/fluids/tank/FluidTankBlockEntity.java
# src/main/java/com/simibubi/create/content/kinetics/base/KineticBlockEntity.java
# src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerBlockEntity.java
# src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerHandler.java
# src/main/java/com/simibubi/create/content/kinetics/mechanicalArm/AllArmInteractionPointTypes.java
# src/main/java/com/simibubi/create/content/kinetics/steamEngine/SteamEngineBlockEntity.java
# src/main/java/com/simibubi/create/content/kinetics/waterwheel/WaterWheelStructuralBlock.java
# src/main/java/com/simibubi/create/content/logistics/chute/ChuteBlockEntity.java
# src/main/java/com/simibubi/create/content/logistics/filter/FilterItemStack.java
# src/main/java/com/simibubi/create/content/logistics/funnel/FunnelBlockEntity.java
# src/main/java/com/simibubi/create/content/logistics/packagePort/frogport/FrogportBlockEntity.java
# src/main/java/com/simibubi/create/content/logistics/stockTicker/StockTickerBlockEntity.java
# src/main/java/com/simibubi/create/content/logistics/tunnel/BrassTunnelBlockEntity.java
# src/main/java/com/simibubi/create/content/logistics/vault/ItemVaultBlock.java
# src/main/java/com/simibubi/create/content/processing/basin/BasinBlockEntity.java
# src/main/java/com/simibubi/create/content/processing/burner/BlockBasedTrainConductorInteractionBehaviour.java
# src/main/java/com/simibubi/create/content/redstone/link/controller/LecternControllerBlockEntity.java
# src/main/java/com/simibubi/create/content/trains/track/AllPortalTracks.java
# src/main/java/com/simibubi/create/foundation/data/CreateRegistrate.java
# src/main/java/com/simibubi/create/foundation/item/ItemHelper.java
# src/main/java/com/simibubi/create/foundation/utility/DyeHelper.java
# src/main/java/com/simibubi/create/infrastructure/debugInfo/ServerDebugInfoPacket.java
# src/main/resources/META-INF/mods.toml
2025-01-28 13:21:10 -05:00
Jozufozu
5cc77c6d2a
Making room
...
- Move to createmod maven Flywheel
2025-01-26 17:48:43 -08:00
IThundxr
91766abf62
Evening fixes
2025-01-22 17:28:32 -05:00
IThundxr
4ab0209310
Forgotten text
...
- Add maven for neoforgeconfigapiport so gametest server runs properly
2025-01-21 09:18:44 -05:00
IThundxr
1edd6ad2df
Clipping clipboards
...
- Fix crash when closing the clipboard window
- Fix runtime generated recipes
2025-01-20 10:30:34 -05:00
IThundxr
f4be0420e9
Missing records
2025-01-19 21:17:01 -05:00
IThundxr
664a7fa954
Old days
...
- Fix forge bundling an old version of ponder
2025-01-18 21:04:54 -05:00
IThundxr
e261439c63
Merge branch 'mc1.20.1/feature-dev' into mc1.21.1/dev
2025-01-18 13:07:17 -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
IThundxr
9edc952d3a
Merge branch 'mc1.20.1/feature-dev' into mc1.21.1/dev
2025-01-17 22:16:44 -05: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
e91a85c19b
Evening Debug Session
...
- Fix tunnels causing a stack overflow
- Fix crushing wheel gametest
- Fix frog seat position
- Update track placement codec
2025-01-10 21:46:47 -05:00
IThundxr
c9de2141e8
Broken keyboard
...
- Fix configuration cache, save archivesBaseName to a local var before using it in jar task
2025-01-09 21:33:41 -05:00
IThundxr
d5ef7e5147
Eclipsed
...
- Modify property expansion to use a method that's compatible with eclipse and running with Intellij instead of Gradle in the build and run with setting
2025-01-09 17:52:55 -05:00
IThundxr
cd78878bd3
Curious curios
...
- Reimplement support for curios
# Conflicts:
# gradle.properties
2025-01-07 21:00:48 -05:00
IThundxr
15565fab47
Port to 1.21.1
...
Co-authored-by: TropheusJ <jverrellijr@icloud.com>
Co-authored-by: techno-sam <77073745+techno-sam@users.noreply.github.com>
Co-authored-by: ryanhcode <42245712+ryanhcode@users.noreply.github.com>
2025-01-07 21:00:32 -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 8ca03ded6486ceb9e95497205a7d5b6856bda897205a7d51
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
