mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-11-13 05:54:17 +01:00
Code Issues Packages Projects Releases Wiki Activity
3,895 Commits 31 Branches 14 Tags 106 MiB
8ca03ded64
Commit Graph

193 Commits

Author SHA1 Message Date
simibubi
97205a7d51 Tube map 
- Added fullscreen map integration for FTB Chunks and Journeymap
 2024-09-03 12:58:02 +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
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
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
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
simibubi
3e2aa3bd65 Merge remote-tracking branch 'origin/mc1.19/dev' into mc1.20.1/dev 2023-09-21 18:09:24 +02:00
simibubi
2d0bf81906 Merge branch 'mc1.18/dev' into mc1.19/dev 2023-09-21 18:05:13 +02:00
simibubi
0510ea3e20 Perform over Function 
- Chutes, (Extracting) Funnels, Smart Observers and Threshold Switches no longer search vault contents unless the vault contents have changed
- Extracting Funnels no longer search their inventories' contents if their target depot or belt is occupied
 2023-09-21 13:09:03 +02:00
simibubi
f181799185 Merge remote-tracking branch 'origin/mc1.19/dev' into mc1.20.1/dev 2023-09-20 19:23:56 +02:00
simibubi
cfff4e42a0 Merge branch 'mc1.18/dev' into mc1.19/dev 2023-09-20 18:20:04 +02:00
simibubi
1439a52a37 3D 
- Trains can now travel through Aether Portals
 2023-09-20 14:34:01 +02:00
PepperCode1
0ee8e18587 The last lang merge 
- Add CreateRegistrate#addLangPostprocessor to arbitrarily transform
lang entry map generated by Registrate
- Remove all uses of and deprecate LangMerger and LangPartial
- Move additional tag definitions from TagGen to CreateRegistrateTags
- Move GatherDataEvent handler to CreateDatagen class
- Move some Create-specific datagen classes to infrastructure package
 2023-08-29 17:45:54 -07:00
PepperCode1
78cf451f6d Merge branch 'mc1.19/dev' into mc1.20.1/dev 
Conflicts:
	gradle.properties
	src/main/java/com/simibubi/create/Create.java
	src/main/java/com/simibubi/create/content/kinetics/fan/FanProcessing.java
	src/main/java/com/simibubi/create/content/trains/bogey/BogeyRenderer.java
	src/main/java/com/simibubi/create/foundation/mixin/client/FixNormalScalingMixin.java
	src/main/java/com/simibubi/create/infrastructure/gametest/tests/TestItems.java
 2023-08-24 22:28:32 -07:00
PepperCode1
3bafe6fe40 Merge branch 'mc1.18/dev' into mc1.19/dev 
Conflicts:
	gradle.properties
	src/generated/resources/.cache/cache
	src/main/java/com/simibubi/create/Create.java
	src/main/java/com/simibubi/create/compat/storageDrawers/StorageDrawers.java
	src/main/java/com/simibubi/create/content/decoration/copycat/CopycatBarsModel.java
	src/main/java/com/simibubi/create/content/decoration/copycat/CopycatModel.java
	src/main/java/com/simibubi/create/content/equipment/armor/DivingHelmetItem.java
	src/main/java/com/simibubi/create/content/equipment/armor/RemainingAirOverlay.java
	src/main/java/com/simibubi/create/content/kinetics/fan/AirFlowParticle.java
 2023-08-24 18:44:37 -07:00
PepperCode1
c5e7ad623f Update Flywheel 
- Fix too many implementations of ProcessingRecipe#canSpecifyDuration
returning true
 2023-08-23 15:36:19 -07:00
simibubi
e6759d8ecc Can't touch this 
- Fixed collision with belts causing a crash in recent forge versions
 2023-07-05 12:38:10 +02:00
simibubi
193c905f24 The Magic Formula 
- Re-enable the computercraft integration
- Some ponder oddities
- Update pack format
 2023-07-04 23:14:05 +02:00
simibubi
82c5ad6e0f Merge remote-tracking branch 'origin/mc1.19/dev' into mc1.20.1/dev 2023-07-04 18:32:57 +02:00
PepperCode1
28bc839572 Merge branch 'mc1.18/dev' into mc1.19/dev 
Conflicts:
	gradle.properties
	src/generated/resources/.cache/cache
	src/main/java/com/simibubi/create/content/contraptions/render/ContraptionRenderDispatcher.java
	src/main/java/com/simibubi/create/content/decoration/copycat/CopycatPanelModel.java
	src/main/java/com/simibubi/create/content/equipment/armor/RemainingAirOverlay.java
	src/main/java/com/simibubi/create/content/schematics/client/SchematicRenderer.java
	src/main/java/com/simibubi/create/foundation/ponder/element/WorldSectionElement.java
	src/main/java/com/simibubi/create/foundation/render/BakedModelRenderHelper.java
	src/main/java/com/simibubi/create/foundation/render/SuperByteBuffer.java
 2023-07-03 15:08:50 -07:00
PepperCode1
246543c76b Fix memory leaks 
- Fix CopycatPanelModel using wrong state during trapdoor special case
- Update Flywheel
 2023-07-03 13:53:51 -07:00
PepperCode1
bd487ce243 Merge branch 'mc1.18/dev' into mc1.19/dev 
Conflicts:
	gradle.properties
	src/main/java/com/simibubi/create/compat/computercraft/implementation/ComputerBehaviour.java
	src/main/java/com/simibubi/create/content/equipment/armor/DivingHelmetItem.java
 2023-07-03 09:18:23 -07:00
PepperCode1
a947a06263 Fix diving helmet check 
- Update Flywheel
- Update buildscipt and Gradle
- Bump version
 2023-06-30 14:12:48 -07:00
simibubi
133756f571 Trails & Fails 
- Update buildscript for 1.20.1
 2023-06-27 04:15:44 +02:00
simibubi
d40476ea87 Merge 0.5.1 to 1.19.3 2023-06-27 03:32:58 +02:00
simibubi
f27f4b0f2e Merge remote-tracking branch 'origin/mc1.18/0.5.1' into mc1.19/0.5.1 2023-05-21 22:27:54 +02:00
simibubi
9c41acfb2a Backport of the century 
- Flywheel is now included (jij) in Create jars on 1.18.2
 2023-05-20 22:14:06 +02:00
PepperCode1
eaf71102a7 Update JEI Maven and FG 2023-05-20 08:37:56 -07:00
simibubi
500019465a Merge remote-tracking branch 'origin/mc1.18/0.5.1' into mc1.19/0.5.1 2023-05-12 22:59:18 +02:00