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

2433 commits

This branch
This branch
All branches
Author SHA1 Message Date
滢月凛霜
a7a2af7b08
Updates to zh_cn.json by Water-Moon (#2022) 2021-07-24 20:15:39 +02:00
simibubi
77aa620fb9
Merge pull request #2026 from garyyo/mc1.16/dev 
- Fixed incorrect damage displayed in the tooltip of potato cannons
 2021-07-24 20:06:45 +02:00
Jozufozu
6a97a31297 Bump flywheel version 2021-07-23 23:54:42 -07:00
Jozufozu
5308671882 MaterialManager and MaterialGroup refactor 
- Material manager builder
 - No more overload render method/IProgramCallback
 - MaterialRenderers accept a Program consumer instead
 2021-07-23 23:45:31 -07:00
Jozufozu
976017d084 Merge branch 'mc1.16/dev' into mc1.16/flw/vanilla-opt 2021-07-23 12:35:56 -07:00
Jozufozu
f06983c339 Basic model abstraction 
- Stop providing a buffered model supplier
 - Instead, provide an IModel supplier
 - IModel exposes basic properties of models
 - IModel exposes a method to copy the model to a VecBuffer
 2021-07-23 12:26:33 -07:00
PepperBell
c4236ad884 Forgotten call 2021-07-23 10:53:09 -07:00
PepperBell
8f6dcb8ba6 Fix resource leak 
- Fix ponder resources not being closed properly
 2021-07-22 16:13:03 -07:00
PepperBell
37261ee8e6 Update Forge 
- Bump minimum required Forge version to 36.2.0
- Re-add chorus teleport event compatibility
- Update Flywheel, JEI, and Shade plugin
 2021-07-22 14:16:00 -07:00
Jozufozu
b188f97ae0 Merge branch 'mc1.16/dev' into mc1.16/flw/vanilla-opt 2021-07-22 14:10:20 -07:00
Jozufozu
89c34262d0 Flaps no longer use old origin pos behavior 2021-07-22 14:06:48 -07:00
PepperBell
c3f87ec347 Recipe interface 
- Add IRecipeTypeInfo to replace AllRecipeTypes method calls in most
cases to allow for better addon support
- Tweak some visibility modifiers
 2021-07-22 13:40:40 -07:00
garyantonyo
2ded6bd2fa Remove flooring of damage as it no longer is useful with the new damage calculation 2021-07-22 11:20:49 -04:00
garyantonyo
35778640ba Flooring is always done on damage calculation, so add it to the description tooltip too? 2021-07-22 11:16:44 -04:00
garyantonyo
64e822626e update PotatoCannonItem damage description to reflect changes to PotatoProjectileEntity 2021-07-22 11:12:21 -04:00
Jozufozu
a52b6d766f MaterialGroups and massive refactors 
- Move material stuff to its own package
 - The various render functions in the material tree now bind to specific render layers
 - Instancers can choose which layer to use
 - The layers are SOLID, CUTOUT, and TRANSPARENT
 - More layers are likely unnecessary, but we'll see
 - Deprecate functions in MaterialManager in favor of more builderesque ones using MaterialGroups
 - Catching up with Flywheel
 - Remove MatrixStacker in favor of Flywheel's TransformStack (thread safety too)
 2021-07-21 20:30:35 -07:00
PepperBell
2cea2e1c0f OpenEndedPipe effect API 
- Allow registering custom effect handlers for open ended pipes
- Add some getter methods to OpenEndedPipe
 2021-07-21 14:48:39 -07:00
PepperBell
0c3696dd21 Extra alternative 
- Rename AnimatedKinetics#defaultBlockElement to
AnimatedKinetics#blockElement
- Add static alternative to AnimatedKinetics#blockElement meant to be
used outside of subclasses
 2021-07-21 12:49:55 -07:00
PepperBell
28d9df16f2 Post-PR datagen 2021-07-20 17:45:41 -07:00
PepperCode1
619a69e312
Merge pull request #2017 from embeddedt/patch-1 
Fix capitalization in English subtitles
 2021-07-20 17:42:43 -07:00
Themba Dube
f1815e1d2d Fix capitalization in English subtitles 2021-07-20 19:44:20 -04:00
PepperBell
d5e659dad2 Merge remote-tracking branch 'upstream/mc1.16/creative-cake' into 
mc1.16/dev

Conflicts:
	src/generated/resources/.cache/cache
	src/generated/resources/assets/create/lang/unfinished/ja_jp.json
	src/generated/resources/assets/create/lang/unfinished/ru_ru.json
 2021-07-18 19:47:39 -07:00
PepperBell
b8107557bf Creative cake touch-ups 
- Redo texture
- Add tooltip summary and actions
 2021-07-18 18:32:29 -07:00
simibubi
1e7078fe56 One-liner marathon 
- Version bump
- Implement #1969
- Guard emptying JEI integration from empty item outputs, addresses #1994
- Goggles icon no longer renders when menu button is set invisible, addresses #1979
- Fixed missing blaze burner in JEI's display of heated compacting recipes, addresses #1970
 2021-07-18 17:37:14 +02:00
simibubi
909bf8a03f Post-PR datagen 2021-07-18 15:38:00 +02:00
CKenJa
1928b1e98c
Updates to ja_jp.json by CKenJa (#1996) 2021-07-18 15:34:04 +02:00
pgkrol
d6fedab1ae
Updates to ru_ru.json by pgkrol & Hanqnero (#1966) 2021-07-18 15:32:43 +02:00
qkrehf2
d4d18a5bd4
Updates to ko_kr.json by qkrehf2 & Red1854th (#1958) 2021-07-18 15:21:11 +02:00
PepperBell
9923f04ff5 Allow building sequenced assembly recipe directly 
- Resolves #1991
 2021-07-17 20:53:39 -07:00
PepperBell
f4eaf6fff4 Tweak creative particle colors to match palette 2021-07-17 18:01:54 -07:00
PepperBell
01366e30bb Merge remote-tracking branch 'upstream/mc1.16/dev' into 
mc1.16/creative-cake

Conflicts:
	src/generated/resources/.cache/cache
	src/generated/resources/assets/create/lang/unfinished/zh_tw.json
 2021-07-17 17:52:39 -07:00
PepperBell
4bdd802170 Organize imports 2021-07-17 00:46:35 -07:00
PepperBell
ca94873148 Ponder namespace refactor 
- Add full support for custom namespaces in ponder
- Make ponder files use Minecraft's resource system
- Allow easily registering and generating ponder lang for any namespace
 2021-07-17 00:39:05 -07:00
PepperBell
1dd7c4bc1e Minor cleanup changes 
- Change AllRecipeTypes to have less repetition and force getter usage
 2021-07-16 15:11:28 -07:00
PepperBell
7ec02fd040 Merge remote-tracking branch 'upstream/mc1.16/dev' into 
mc1.16/creative-cake

Conflicts:
	src/main/java/com/simibubi/create/AllBlocks.java
	src/main/java/com/simibubi/create/content/contraptions/processing/burner/BlazeBurnerBlock.java
	src/main/java/com/simibubi/create/content/contraptions/processing/burner/BlazeBurnerHandler.java
	src/main/java/com/simibubi/create/content/contraptions/processing/burner/BlazeBurnerTileEntity.java
	src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmInteractionPoint.java
 2021-07-15 13:21:47 -07:00
PepperBell
681791a329 Update Gradle wrapper files 2021-07-15 11:52:19 -07:00
grimmauld
5610f63375 no more outdated gradle 2021-07-15 11:53:08 +02:00
grimmauld
d53e89887a fix obfuscation reflection helper calls 2021-07-15 11:45:45 +02:00
grimmauld
9e4198fa79 fix mixins 2021-07-15 11:39:37 +02:00
grimmauld
a048285699 Bulk remap, compiles 2021-07-15 11:32:03 +02:00
PepperBell
0088a5c404 Merge remote-tracking branch 'upstream/mc1.16/dev' into mc1.16/creative-cake 2021-07-14 16:07:48 -07:00
PepperBell
8f4be44a6d Fix blaze cake burn time 
- 240 ticks/1.2 items -> 6400 ticks/32 items
 2021-07-14 16:00:29 -07:00
Jozufozu
a8bdf710fa Bump flywheel version 2021-07-14 15:56:44 -07:00
PepperBell
777d47ca8b Fix depot rendering and potato cannon model 
- Upright items were reflected when rendered on depots
- Potato cannon model had itself as parent and faces with invalid
texture
 2021-07-14 15:12:59 -07:00
PepperBell
a17dd26aab Add creative cake 
- Item texture and particle colors are not final
 2021-07-14 13:29:02 -07:00
Simba-Fs
2b1a76039e
Updates to zh_tw.json by simba-fs (#1952) 2021-07-13 17:26:54 +02:00
reidbhuntley
f3a521121d Advanced Arm Applications 
- Mechanical Arms remember their targets when placed by Schematicannon (for real this time)
- Mechanical Arms will now rotate/mirror their targets when rotated/mirrored in a schematic or contraption
 2021-07-12 22:03:22 -04:00
simibubi
2300e0e58a Bug Fixes 
- Copper backtanks can no longer accumulate air pressure when waterlogged
- Copper backtanks now emit a comparator output
- Removed id prefix requirement for ponder and seq. assembly tooltips #1931
- Improved the odds to succeed of existing sequenced assembly recipes
- "junk" -> "salvage"
 2021-07-12 20:02:47 +02:00
simibubi
091a70b420 Post-PR datagen 2021-07-12 11:35:43 +02:00
qkrehf2
6c89dadedd
Updates to ko_kr.json by qkrehf2 (#1938) 2021-07-12 11:31:55 +02:00