Commit Graph

3002 Commits

Author SHA1 Message Date
20d1403ede Fix getUnformattedDeepText breaking with translation text components, which resulted in double tooltip text 2020-11-17 14:58:48 +01:00
d16f41ccfb Merge branch 'mc1.15/dev' into mc1.16/dev
# Conflicts:
#	src/generated/resources/.cache/cache
2020-11-17 14:37:47 +01:00
5022dadd7c Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev 2020-11-17 14:35:24 +01:00
8dff92e0bf Added chest minecart contraption item and wrenching of chest minecart contraptions 2020-11-17 14:35:07 +01:00
7bd339e655 Fix typo and messed up key 2020-11-17 14:13:53 +01:00
ugudango
3635611365 Casted ByteBuffer to Buffer in multiple places, for better backwards compatibility. 2020-11-17 01:46:27 +02:00
simibubi
78ffba254e
Merge pull request #511 from lizelive/mc1.15/dev
add a simple ci
2020-11-16 10:57:45 +01:00
1a7bf39fc1 Add copper zinc and brass as beacon base back in
this was removed in 1.16.3 as it is now a block tag.
2020-11-15 15:21:38 +01:00
a00f619017 porty porty all the PRs 2020-11-15 10:41:05 +01:00
lizelive
ac83085641
add a ci 2020-11-14 19:29:58 -08:00
simibubi
e4fa2de11e PR dusting
- Some lang fixes/adjustments
- runData
2020-11-14 22:53:15 +01:00
simibubi
209f26f448
Merge pull request #507 from kohlth/mc1.15/dev
Tweak P.S.I tool tip for clarification
2020-11-14 22:35:57 +01:00
simibubi
95c07b28be
Merge pull request #506 from Creators-of-Create/Noobulus-tooltip-patch-1
Fixed some tooltips
2020-11-14 22:14:37 +01:00
simibubi
d383965618
Merge pull request #503 from Snownee/mc1.15/snownee
Bug fixes
2020-11-14 22:10:16 +01:00
lizelive
730078f76a
fix build error (#509)
* fix #508 build error
2020-11-14 21:19:48 +01:00
fb46a8b59a Nozzles on Chutes 2020-11-14 16:48:32 +01:00
9ea09aef4c merge recent progress to 1.16 2020-11-14 15:22:32 +01:00
f01d80fd04 Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev 2020-11-14 12:18:01 +01:00
2a9542e2bb Loading 1.14 worlds? Yes please.
Added highly experimental remap event support
2020-11-14 12:15:38 +01:00
simibubi
9a7596286d JEI Integration: Spout and Drain 2020-11-13 20:56:39 +01:00
simibubi
103c1a7441 Lifeless Flames
- Empty blaziers can now be lit using flint and steel
- Blaze burners now have ambient sounds and sounds played when fed items
2020-11-12 12:58:26 +01:00
kohlth
8b4736c609
PSU minor tooltip tweak for clarification
Made it clearer you insert/extract from the stationary interface
2020-11-11 22:04:40 -06:00
kohlth
5d690b24fe
Merge pull request #1 from Creators-of-Create/mc1.15/dev
update fork to do some minor tooltip work
2020-11-11 21:52:50 -06:00
Snownee
c730517fb4 Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/snownee
# Conflicts:
#	src/generated/resources/.cache/cache
#	src/generated/resources/assets/create/blockstates/fluid_pipe.json
2020-11-12 08:03:24 +08:00
simibubi
675af419ce Fixing user errors
- Added hints when looking at
-    Mechanical arms with no targets
-    Funnels attempted to be used like 0.2 transposers
-    Bearings that require an update to attach to their blocks
- Added some additional feedback when players apply filters
- Spouts now place two blocks above a depot/belt when used
- Basins can no longer be placed directly under a press or mixer
- Fixed prismarine recipe cycles from various mod interactions
2020-11-11 23:59:40 +01:00
simibubi
287db27ef0 The Funnel doesn't end here
- Updated wrench model (Kryppers)
- Funnels on depots and perpendicular to belts use a new model
- Funnels at the end of belts
    - no longer have a directional constraint
    - can now be extended/retracted manually
    - now hold items back at the block boundary
- Extracting Funnels on top of belts can now specify an amount no their filter, taking x items off a nearby stack when possible
- Fixed some issues with belt/funnel interaction
- Items reaching the end of a belt will still be regularly checked by perpendicular funnels in the space
- Contraptions now render blocks in appropriate render layers
- Straight diagonal Chutes now create an intersection when a funnel is directly above them
- Attempted a safety fix to bracket removal from shafts and cogs
- Fixed windmill structures not stalling when their attached network is overstressed
2020-11-11 19:00:31 +01:00
Snownee
6cc6973bc8 Fix BeltInventory.eject different behavior in orientations 2020-11-11 11:54:04 +08:00
Snownee
466739bcf5 Fix Extendo Grip knockback 2020-11-11 10:52:57 +08:00
Noobulus
6d1b1e2474
Fixed some tooltips
Added a period to the end of the Spout tooltip to match other tooltips
Fixed the blaze burner tooltip (was using blaze_heater, which I assume is an older name for the block)
2020-11-10 12:14:34 -06:00
Snownee
85b3ab2025 Fix SchematicWorld NPE 2020-11-11 01:48:42 +08:00
Snownee
5bd6110d59 Implement GuiBlockModelRenderBuilder tinting 2020-11-11 01:17:06 +08:00
Snownee
1afab1dd51 Fix slab loot tables 2020-11-11 00:57:29 +08:00
Snownee
196083cb00 Packet workaround 2020-11-10 00:51:56 +08:00
Snownee
6b34eb453d Defensive coding to prevent client chunk loading 2020-11-08 22:54:46 +08:00
Snownee
2e3100be9a Fix JEI ingredients getting merged incorrectly 2020-11-08 20:53:12 +08:00
Snownee
671f307071 Fix blockzapper duplicating bonemeal and breaking bedrock 2020-11-08 18:12:44 +08:00
Snownee
5958370900 Give ProcessingOutput a default count 2020-11-08 17:30:40 +08:00
Snownee
428dda58e7 Fix deployer duplicating Quark pickarang 2020-11-08 16:30:55 +08:00
Snownee
073e3980ee Fix water rendering overlay on glass blocks 2020-11-08 16:29:58 +08:00
simibubi
fb06dc5e72 Port new changes to 1.16 2020-11-06 20:56:19 +01:00
simibubi
0a98171384 Merge branch 'mc1.15/dev' into mc1.16/dev 2020-11-06 20:49:00 +01:00
simibubi
dbfe7f93fa Spinny vortex
- Crushing wheels no longer z-fight with chutes
- Improved rendering of items and fluids inside basins
2020-11-06 19:45:38 +01:00
simibubi
d5f08aab76 Brackets and spilled potions
- Added wooden and metal brackets
- Brackets can be applied to shafts, cogs and fluid pipes
- Brackets prevent pipes from connecting to adjacent pipes
- Fixed blockzapper not showing up in the searchable creative menu
- Added config values for hose pulleys
- Hose pulleys now extinguish lit waterloggable blocks
- Hose pulley now break blocks that cannot withstand vanilla fluid flows
- Spout is now wrenchable
- Fixed spout not activating properly
- Added fluid particles that supports fluids without a block variant
- Potion fluids now apply their effects to nearby entities when spilling from an open end
- Fixed pumps not rendering fluid particles when spilling/pulling fluids directly
- Hose Pulley no longer accepts fluids that cannot be placed
- Hose Pulleys and open pipes can no longer place water in the nether
- Some Refactors to the particle system
- Reverted reversed crtl activation for schematic tools
- Added a command to fix broken lighting in some of creates models (enables experimental forge block rendering)
- Fixed fluid ingredients in jei once again
- Fixed fluid tag ingredients being resolved on the client
2020-11-04 19:08:01 +01:00
simibubi
910bdf5d19 Port changes to 1.16 2020-10-30 19:47:40 +01:00
simibubi
d26139576c Merge branch 'mc1.15/dev' into mc1.16/dev 2020-10-30 19:36:03 +01:00
simibubi
e701569fee Automatic Acrobatics
- Added the item drain
- Refactored pulley renderers
- Fixed belt funnel not dropping filters
- Fixed funnel filter slot positioning on upward facing funnels
- Sails can now be sheared
- Fixed the kinetic connectivity of the rotation speed controller
- Valve handles can now by dyed in world
- Seats can now be dyed in world
- Fixed Stockpile Switch emitting redstone power towards its detection target
- Organized Imports
- Fixed server launch issues
2020-10-30 19:28:33 +01:00
simibubi
a9c90cd2b6 Clean-up Crew
- Fixed datagen
- Fixed tank multi-place
- Organized imports
2020-10-30 12:18:21 +01:00
simibubi
18c4402cf2
Merge pull request #496 from wchen1990/mc1.16/dev
Merged mc1.15/dev changes to mc1.16/dev
2020-10-30 11:26:05 +01:00
Bob Dole
16ab29be1d Converted to 1.16 appropriate ways - builds 2020-10-30 03:11:07 -04:00
Bob Dole
c739fdbb09 Resolved merge conflicts - Does not Build 2020-10-30 03:06:15 -04:00