mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-12-26 15:06:42 +01:00
Code Issues Projects Releases Packages Wiki Activity
3558 commits 31 branches 14 tags 107 MiB
Commit graph

3558 commits

This branch
This branch
All branches
Author SHA1 Message Date
zelophed
5e235db2fc merge new changes to 1.20.1 2023-11-15 21:34:05 +01:00
zelophed
396122f15f Merge branch 'mc1.19/catnip' into mc1.20.1/catnip 2023-11-15 19:19:08 +01:00
zelophed
01b214b28d all the elements 
- even more ponder API refactors
 2023-11-05 15:21:23 +01:00
zelophed
26b5e87fec Merge branch 'mc1.19/catnip' into mc1.20.1/catnip 
# Conflicts:
#	gradle.properties
#	src/main/java/com/simibubi/create/infrastructure/ponder/scenes/fluid/DrainScenes.java
#	src/main/java/com/simibubi/create/infrastructure/ponder/scenes/fluid/FluidMovementActorScenes.java
#	src/main/java/com/simibubi/create/infrastructure/ponder/scenes/fluid/FluidTankScenes.java
#	src/main/java/com/simibubi/create/infrastructure/ponder/scenes/fluid/HosePulleyScenes.java
#	src/main/java/com/simibubi/create/infrastructure/ponder/scenes/fluid/PipeScenes.java
 2023-09-16 17:08:49 +02:00
zelophed
c25968853d more ponder API refactors 2023-09-16 13:25:26 +02:00
zelophed
e9b0229f71 refactor part of the ponder registration API 2023-09-11 01:33:45 +02:00
zelophed
3dd4a3a051 merge mc1.20.1/dev and port to 1.20.1 2023-08-31 18:47:01 +02:00
zelophed
c847680b46 merge mc1.19/dev 2023-08-29 23:04:07 +02:00
zelophed
dce985737c Fixed SmartBE's not being marked as virtual by Ponder 
- minor improvements to ponderUI animations
 2023-08-27 12:11:41 +02:00
PepperCode1
9a70cfff41 Refactor damage types 
- Replace DamageTypeData with DamageTypeBuilder and CreateDamageSources;
make DamageType- and DamageSource-related code more like vanilla
- Fix generated DamageType tags assigning all entries as optional
- Combine DamageTypeDataProvider and WorldgenDataProvider into
GeneratedEntriesProvider
 2023-08-25 18:59:05 -07:00
PepperCode1
7021a17226 Remove Entity#level AT 
Use an invoker for Entity#setLevel() instead
 2023-08-25 16:15:12 -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
attackeight
282181cb9c
Fix Various Bugs relating to Cherry and Bamboo wood not being included in the Create Mod (#5099) 
* Fixed Cherry wood not being encase-able

* Fixed Bamboo wood not being encase-able

* Fixed Cherry and Bamboo Wood Not Having Cutting Recipes

* Move bamboo block to log and fix recipe

* Finalize changes

- Add recipe to cut bamboo planks into bamboo mosaic

---------

Co-authored-by: PepperCode1 <44146161+PepperCode1@users.noreply.github.com>
 2023-08-23 16:40:40 -07:00
PepperCode1
c5e7ad623f Update Flywheel 
- Fix too many implementations of ProcessingRecipe#canSpecifyDuration
returning true
 2023-08-23 15:36:19 -07:00
PepperCode1
2a1c6e6916 Allow registration of custom fan processing types 
- Fix crash on startup
 2023-08-20 19:52:41 -07:00
KostromDan
8f5031c330
Added support of other packet size optimisation mods. (#5362) 
* Added support of other packet size optimisation mods. (Connectivity and Packet Fixer)

* Added comment why we need min (not max) value.

* Finalize changes

---------

Co-authored-by: PepperCode1 <44146161+PepperCode1@users.noreply.github.com>
 2023-08-18 17:47:44 -07:00
zelophed
9620acec04 update dependency versions 2023-08-17 16:34:43 +02:00
PepperCode1
c052807773 Fix copycat model modifying potentially immutable list 
- Perform minor mod initialization clean up
- Bump version to patch E
- Organize imports
 2023-08-16 17:03:07 -07:00
PepperCode1
56923db317 Remove unnecessary files 2023-08-16 15:58:13 -07:00
zelophed
c4facc4bf4 clean up buildscripts 2023-08-17 00:30:28 +02:00
zelophed
4a465ad24b merge 1.19/dev, port to 1.19.2 2023-08-16 15:16:11 +02:00
zelophed
9098002c17 Wait it's all Flywheel? Always has been. 
- add flywheel as a dependency to catnip
 2023-08-13 23:39:10 +02:00
zelophed
f6c6942d14 merge 1.18/dev into 1.18/catnip, catch up with 0.5.1 2023-08-11 00:46:19 +02:00
PepperCode1
1bf201e77c Refine PR changes and improve Mods class 2023-08-09 20:40:21 -06:00
Michael Bunting
c336c92eb9
Add tag to ban recipe serializers from automation (#5298) 2023-08-09 20:33:10 -06:00
zelophed
e9b5c01bc1 update gradle version and buildscripts 
- also includes diverse leftover changes
 2023-08-07 15:35:30 +02:00
PepperCode1
dc2b7c599d Remove incorrectly merged CreateRegistry 
This class was renamed to AttachedRegistry during the 0.5.1 update.
 2023-08-06 20:22:11 -06:00
simibubi
104985d9ed Server-friendly Item Groups 2023-08-05 23:56:31 +02:00
Oier Bravo Urtasun
be66f2b77a
Lang merger generic rollback (#5270) 2023-08-04 07:43:33 -06:00
simibubi
0bfd98fccd Update bug_report.yml 2023-07-05 12:38:44 +02: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
5625e4ba76
Merge pull request #5059 from AndreAugustoAAQ/patch-2 
Update README 'supporters' and 'available for' bagdges
 2023-07-05 02:05:17 +02:00
simibubi
e78cf54211 Update bug_report.yml 2023-07-05 02:02:58 +02:00
André Augusto
2cffed55ab
Update README 'supporters' and 'available for' bagdges 2023-07-04 20:59:35 -03: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
2a93caf5c7 Port new Changes 2023-07-04 18:37:23 +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
simibubi
20fde5574c Merge branch 'mc1.18/dev' into mc1.19/dev 2023-07-04 17:58:18 +02:00
simibubi
064dc1e247 More NPE Guards 2023-07-04 17:56:30 +02:00
simibubi
6819fc1c42 Issue. Gesundheit 
- Fixed an incompatibility with Supplementaries leading to a server crash
- Fixed fallback damage bar colour for air powered tools
- Various NPE guards
- Fixed sequenced assembly recipes conflicting when starting with a filling step
- Potato cannons can no longer plant crops on the side of farmland
- Fixed Mechanical rollers consuming filter items despite not supporting them
- Fixed brass tunnels not refunding previous filter items when changed
- Fixed catalyst ingredients getting consumed in the basin
 2023-07-04 17:43:54 +02:00
simibubi
a6a4078356 Fixed wood cutting compat for HexCasting #5058 2023-07-04 13:28:09 +02:00
simibubi
364ad6edf2 Honey Vision 
- Moved fluid fog distance and colour handling to their fluid types
- Bumped Flywheel
 2023-07-04 12:43:50 +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
simibubi
886398f679
Merge pull request #5057 from Creators-of-Create/l10n_crowdin_translations 
New Crowdin translations
 2023-07-03 19:14:34 +02:00
Crowdin Bot
e3bce02f3e New Crowdin translations by Github Action 2023-07-03 17:09:21 +00:00
simibubi
66797f233d PR tidy-up 
- backport of #4998
- Rename localisation readme so github displays it in the folder view
 2023-07-03 18:34:47 +02: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
Rabbitminers
4d7b64db49
Updates to the Bogey API (#4875) 
- Provided bogey data during model initialisation and patched other oversights in BogeyRenderer
- Refactored method names in BogeyRenderer
- Implemented interface for interactions with custom bogey blocks
- Implemented wrapper record for bogey model data
 2023-07-03 18:08:54 +02:00