mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-11-16 07:24:32 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,290 Commits 31 Branches 14 Tags 106 MiB
20b2ec4b63
Commit Graph

2186 Commits

Author SHA1 Message Date
simibubi
65f1748e04
Merge branch 'mc1.16/dev' into fix-milk 2021-07-24 20:57:05 +02:00
simibubi
3e92574130 Mixing 24/7 
- Fixed mixer and press not checking for recipes once more after completing
- Creative Cake -> Creative Blaze Cake
- Post-PR data
 2021-07-24 20:41:23 +02:00
simibubi
7f61313d51 Merge branch 'mc1.16/dev' of https://github.com/Creators-of-Create/Create into mc1.16/dev 2021-07-24 20:25:58 +02:00
simibubi
4876335de9 Permit the new Flywheel flywheel version in toml 2021-07-24 20:25:50 +02:00
滢月凛霜
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
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
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
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
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
reidbhuntley
cb41ac679d Use custom FakePlayer for converting Zombie Villagers 2021-07-12 00:43:23 -04:00
reidbhuntley
b70608b030 Yet further finely-tuned 
- Fixed blocks not updating their neighbors when being assembled into a contraption
- Fixed Stockpile Switch not updating its redstone output when its signal is inverted
- Reduced lag caused by many active nearby soul particles
- The Wither's shield is now immune to potato projectiles
- Fixed potato projectile potion effect weirdness
- Golden Apple potato projectiles can now cure Zombie Villagers
- Potato Recovery will no longer drop Golden Apples that successfully hit an entity
 2021-07-11 21:25:41 -04:00
zelophed
4306d076db slow and steady 
- add create's panorama as a background for config ui when opened from the main menu
- fix panoramas moving at a inconsistent speed

- add a optional speed limit to physical floats
 2021-07-11 21:09:23 +02:00
PepperBell
e3386c178a Minor SBB clean up 
- Allow custom light from dual (utility) light method to be applied
- Reorganize and rename some members
 2021-07-10 22:39:42 -07:00
reidbhuntley
3ab3bffac3 Bump StressConfigDefaults version number 
- Should fix Mechanical Arm stress usage staying at the old value in worlds created in previous Create versions
 2021-07-10 23:30:27 -04:00
reidbhuntley
da9c306ed5 Lectern Controller edge cases 
- When a Lectern Controller that a player is using is broken, they are no longer prevented from using any other Lectern Controllers
- Fixed weirdness when activating a Lectern Controller while holding another Linked Controller
 2021-07-10 21:52:26 -04:00
simibubi
4a57b916ff Top ten hotswap engineering oversights 
- Fixed reversed frequency display of Redstone Links
 2021-07-11 01:28:28 +02:00
simibubi
2821fd7135 Lamptank 
- Fixed custom rendered models rendering full bright when supposed to render full dark
 2021-07-11 01:14:38 +02:00
reidbhuntley
f726477c8a make unenchanted potato cannons actually do damage (oops) 2021-07-10 18:26:21 -04:00
Jozufozu
f1da8b8f1e Cull code to fix crash on mac 
- A bunch of dead code removal
 2021-07-10 15:20:34 -07:00
Jozufozu
b071229731 Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev 2021-07-10 13:14:05 -07:00
Jozufozu
a28dad9cd6 Bump flywheel version 
- Adjust mods.toml version range
 2021-07-10 13:13:36 -07:00
simibubi
b490716c79 End to end 
- Rotate pipe model in item frames such that they line up when crafting a potato cannon
 2021-07-10 21:27:27 +02:00
simibubi
47059e0caf Fix item particle textures 2021-07-10 21:20:27 +02:00
grimmauld
282a9a6f3a Fix valve handles not having a tooltip 2021-07-10 18:46:44 +02:00
grimmauld
f9a40e2f06 Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev 2021-07-10 10:55:01 +02:00
grimmauld
976d53c9e4 Adjustable repeater, Pulse repeater, Powered latch and toggle latch can now power comparators from the side, like vanilla repeaters already can 2021-07-10 10:54:54 +02:00
reidbhuntley
bc456a76cd Tuber Tube Tidy-up 
- Set recovery chance for unenchanted Potato Cannons to 0
- Power enchantment on Potato Cannons now scales the damage of the projectile type instead of adding to it
- Changed Potato Cannon crafting recipe to better fit the new model
 2021-07-09 23:11:16 -04:00
simibubi
802f8337fb Tweak projectile spawn location 2021-07-10 04:10:47 +02:00
Daniel Amberson
388f836a02 potato cannon polish! 
- completely remade the texture from scratch of both the potato cannon and it's cog
- did some slight model tweaks to the potato cannon itself as well
- no changes to the animations should be needed
 2021-07-09 21:01:55 -05:00
grimmauld
1f4b8d3303 Merge https://github.com/kotakotik22/Create into mc1.16/dev 2021-07-09 23:52:58 +02:00
LordGrimmauld
95ad754654
Merge pull request #1908 from Carbon5/mc1.16/dev 
Superglue follows mobGriefing gamerule
 2021-07-09 23:45:47 +02:00
simibubi
30ba34dbb0 Behind the flaps 
- Brass tunnels now show a goggle tooltip of contained items within their group
- Right-clicking brass tunnels now retrieves all contained items from their group
 2021-07-09 23:43:11 +02:00
grimmauld
e56da570e8 Limit the light 2021-07-09 23:38:28 +02:00
Jozufozu
2eb9c7b6eb PartialModel gets called from the right place 2021-07-09 13:39:56 -07:00
simibubi
352f213429 Buffing the Buffers 
- Fixed large amounts of output in crushing wheels getting voided due to its buffer capacity
- Fixed basin processing running constant recipe lookups while backed up #1911
- Fixed mixer retracting after every operation when auto-output is active
 2021-07-09 19:27:50 +02:00
kotakotik22
e5eca1ed36 Arm interaction point utilities for addons 2021-07-09 18:45:50 +02:00
PepperBell
7ed7b957dd Flaming souls 
- Add soul flame type to lit blaze burner
- Tweak empty blaze burner ponder to show how to transform flame
 2021-07-09 00:28:21 -07:00
PepperBell
f90dd34f5b Merge branch 'mc1.16/dev' of https://github.com/Creators-of-Create/Create.git into mc1.16/dev 2021-07-08 23:22:36 -07:00
PepperBell
bdbd5c9533 Remote extinguishing 
- Make splash water bottles extinguish lit blaze burners
 2021-07-08 23:21:51 -07:00
Carbon5
63bd4258e1 Superglue follows mobGriefing gamerule 2021-07-08 20:52:39 -04:00
Jozufozu
51ebf2baec Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev 2021-07-08 13:26:13 -07:00
Jozufozu
a800cbea05 Fix funny glue textures 2021-07-08 13:25:35 -07:00
PepperBell
cf3ef8c229 Fix saw blade culling 
- Remove AllColorHandlers as it was empty
- Organize imports
 2021-07-08 11:17:35 -07:00
simibubi
5a031bb99d CrushCrushCrush 
- Added some rudimentary crushing ambience
- Dyed nixie tubes now return the correct item for Pickblock and Schematicannons
 2021-07-08 16:22:59 +02:00
grimmauld
801f5fa130 Filter for shulker fill level 2021-07-08 09:45:53 +02:00
simibubi
d418f06f37 Magitank 
- Copper Backtanks can now be enchanted
- Added the Capacity Enchantment
 2021-07-08 00:03:58 +02:00
simibubi
137e64e90a Post-PR datagen 2021-07-07 22:15:46 +02:00
Nekrodamus
28f647dbda
Updates to es_es.json by FrannDzs 2021-07-07 22:12:04 +02:00
simibubi
83a3faa871 Mortal Compat 
- Commented a teleport hook not yet included in recommended forge
 2021-07-07 22:05:09 +02:00
simibubi
10b0bdbfcf Range indication for bells 
- Stationary Haunted Bells now show particles at the perimeter of the scanned area, regardless of light level
 2021-07-07 19:38:32 +02:00
simibubi
efa2bc745f Magic Potatoes 
- Fixed localization of potato cannon ammo tooltip
- Added several enchantment compatibilities to the Potato Cannon
- Added the Potato Recovery Enchantment
 2021-07-07 17:33:43 +02:00
reidbhuntley
48ea7d64b4 Classic funny 
- When a Cake or Pie projectile launched from a Potato Cannon hits a mob, it will slide down the side of the target
 2021-07-06 21:22:52 -04:00
Daniel Amberson
c14bece04d precision mechanism polish 
- completely redid both the incomplete and complete sprites for the precision mechanisms
 2021-07-06 15:37:03 -05:00
simibubi
0fb5556960 And the hunt continues... 
- Fixed kinetic stress loop caused by neighbouring belts
- Fixed kinetic stress loop caused by activating ejectors
- Fixed recipe book logspam regarding seq. assembly recipes
 2021-07-06 21:26:40 +02:00
simibubi
dcc0c27855 Forge Bump 
- Create now enforces a minimum of Minecraft 1.16.5, Forge 36.1.0+
 2021-07-06 19:18:28 +02:00
simibubi
50aa690619 mlg pvp 
- Added missing localizations for Create's death messages involving an attacker
 2021-07-06 19:17:18 +02:00
simibubi
61279a4c22 Merge branch 'mc1.16/dyeable_nixies' into mc1.16/dev 2021-07-06 18:36:15 +02:00
simibubi
905b140a2f Dyeable Nixies, Part II 
- Ponder doc
- Fixed a few colours
- Fixed text wipe on colour change
- Fixed pick block
- Nixie Tubes can now be picked up using the Wrench
 2021-07-06 18:35:41 +02:00
simibubi
6eb54267f3 Bell Voxelshapes 2021-07-06 17:03:31 +02:00
Daniel Amberson
62cb04f44d Merge branch 'mc1.16/dev' of https://github.com/Creators-of-Create/Create into mc1.16/dev 2021-07-06 09:23:42 -05:00