Commit Graph

2076 Commits

Author SHA1 Message Date
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
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
d53e89887a fix obfuscation reflection helper calls 2021-07-15 11:45:45 +02:00
9e4198fa79 fix mixins 2021-07-15 11:39:37 +02:00
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
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
282a9a6f3a Fix valve handles not having a tooltip 2021-07-10 18:46:44 +02:00
f9a40e2f06 Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev 2021-07-10 10:55:01 +02:00
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
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
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