Commit graph

858 commits

Author SHA1 Message Date
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
simibubi
1942d1dd63 Silence!
- Removed leftovers from debugging
2020-10-30 02:17:58 +01:00
simibubi
5abfc15e9e Destroyer of Lakes
- Added the hose pulley
- Added creative tanks
- Fixed sails not getting consumed when placed against each other
- Items can now be inserted onto belts regardless of it moving or not
- Fixed item duplication on stopped belts
- Refactored fluid block rendering in JEI
- Reworked model of the schematic table
2020-10-30 02:16:08 +01:00
Lucas Barcellos
c63d0980ed Update assets for Cinderflour and Blaze Cake 2020-10-28 22:21:03 -03:00
grimmauld
521ce8a766 port recent changes 2020-10-23 19:01:25 +02:00
simibubi
b2cd378b52 Back in the early game
- Hand cranks can now be made without the need of brass
- Fixed tooltip referrals
- Crafters can no longer be covered when while they are holding an item
- Pushed some numbers around
2020-10-22 01:48:24 +02:00
simibubi
b14664d45f Windmill is Bearing is Clockwork
- Fixed Mechanical Press animation de-sync between server and client
- The press no longer requires a redstone signal to activate on in-world items
- Fixed spouts and basin trying to create potion buckets
- The Mechanical bearing can no longer generate force from wind
- Added the windmill bearing
- Windmill bearings can be configured to rotate counter-clockwise
- Added Sail Frames and Sails
- Sails can by dyed in-world
- Sails negate fall damage
- Sails attach themselves to blocks and do not require a sticky surface or chassis
- Clockwork bearings can now be configured to switch minute and hour hand aswell as use a 24 hour cycle
- Fixed tunnels with windows occluding block faces directly behind them
- Fixed item model of the mechanical saw
2020-10-22 00:50:17 +02:00
grimmauld
89bad1c192 Add Attribute Filter Lang back in 2020-10-21 19:18:29 +02:00
grimmauld
7f643b9fe3 Merge branch 'mc1.15/dev' into mc1.16/dev
# Conflicts:
#	src/main/resources/META-INF/accesstransformer.cfg
2020-10-21 01:17:54 +02:00
grimmauld
420501af89 Fix Server crash on chromatic compound conversion 2020-10-21 01:03:27 +02:00
simibubi
c47e83f87b Merge branch 'mc1.15/dev' into mc1.16/dev 2020-10-20 21:25:17 +02:00
simibubi
0b3f0fd198 More Tweaks 2020-10-20 21:21:33 +02:00
simibubi
12e5b95157 Yet more TextComponent nonsense
1.16 just keeps on giving
2020-10-20 21:03:43 +02:00
simibubi
41148a5e39 Merge branch 'mc1.15/dev' into mc1.16/dev 2020-10-20 21:02:50 +02:00
simibubi
275d8cf7b6 Fixed datapack reload listeners 2020-10-20 19:37:30 +02:00
simibubi
e1c3853264
Merge pull request #491 from wchen1990/mc1.16/dev
Merged latest commits to mc1.16/dev and resolved conflicts
2020-10-20 17:40:04 +02:00
simibubi
a8031b7569 Missed Tags 2020-10-20 17:34:39 +02:00
simibubi
fdd1e22c3e RAM-powered Minecarts
- Fixed critical memory leak from minecart controller listeners
- Made JEI heat conditions a little more readable
2020-10-20 14:56:07 +02:00
simibubi
df252b3e30 Catching up
- remapped seat tooltips
- remapped outdated lang keys
- applied changes of #395 to 1.15
- Fixed Schematic hotbar overlay sometimes drawing on top of the item icon
- Fixed mechanical arm lighting and render bounds issues
2020-10-20 13:42:16 +02:00
simibubi
7ca8325b5f
Merge pull request #484 from gamrguy/extra-attributes
Extra attribute filters
2020-10-20 12:58:35 +02:00
simibubi
47f5225129
Merge pull request #490 from wchen1990/mc1.15/dev
Fix Bell contraptions and Schematic usage
2020-10-20 12:53:30 +02:00
simibubi
7dcd1deb09
Merge pull request #477 from qkrehf2/translation1
Time pasts quiet a lot, and I forgot to upload ko_kr translation file. But here it is!
2020-10-20 12:49:06 +02:00
simibubi
eea9811053
Merge pull request #460 from gamrguy/improved-saws
Improved mechanical saw rendering and contraptions
2020-10-20 12:47:37 +02:00
simibubi
2cc5754b1b
Merge pull request #424 from KhottyManatee55/patch-1
Added Russian translation
2020-10-20 12:45:21 +02:00
simibubi
ac8879a008
Merge pull request #448 from YukkuriC/fix-link-update
Fix link update #447
2020-10-20 12:43:39 +02:00
Bob Dole
7690834343 Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.16/dev 2020-10-19 23:39:23 -04:00
Bob Dole
b30d3369cd Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.16/dev
- Resolved merge conflicts
2020-10-19 23:22:24 -04:00
Kryppers
e54cdf1c96 Lang file Tweaks 2020-10-20 00:10:19 +01:00
Bob Dole
9729c137f1 Fix Bell contraptions and Schematic usage
- Bell contraptions no longer causes a NullPointerException when they
  are stopped
- Schematic usage shouldn't require a player to not be sneaking, and
  changes the key to CTRL to match tool tips
2020-10-19 18:40:59 -04:00
Kryppers
42f97477cf Up-tip the tools.
Another couple of tooltip updates;

I've still left the smart pipe untouched until I've understood the filtering properly.
2020-10-19 23:16:33 +01:00
simibubi
68840362af Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2020-10-19 22:07:07 +02:00
simibubi
b7bed44a61 Basic Brewing
- Refactored JEI plugin to use a builder for categories
- The mixer can now process vanilla potion recipes
- JEI support for fluid potion mixing
- Refined some categories to not show obsolete information
- Compacting and automatic vanilla packing are now in separate tabs
- Fluids can now be manually picked up from a basin
- Basins and Spouts can now extract from and fill vanilla potion items
- Improved the filtering for fluid tests, such as the basin recipe and smart pipes
- Fixed CombinedTankWrapper losing nbt data of transferred fluidstacks
2020-10-19 22:07:05 +02:00
simibubi
cfda2c624d
Merge pull request #487 from wchen1990/mc1.16/dev
Merge mc1.15/dev (a81a411) to mc1.16/dev
2020-10-18 14:53:13 +02:00
Bob Dole
21e19bef9f Merge branch 'mc1.15/dev' into mc1.16/dev
- Resolved merge conflicts
2020-10-18 00:22:25 -04:00
Kryppers
a81a4110d4 Tools: the Tippening.
Fixed an error in my previous commit.

Introduced basic Tooltips for fluid items.

I've left the smart pipe entries as placeholder as I've not tried them out yet.
2020-10-18 00:10:10 +01:00
Kryppers
2cba50c9ab Tool-Tip of the Iceberg
Couple of additional bits of information and some adjustments.

Tooltip added for white_seat. Needs to be added to the other seat colours.
2020-10-17 20:57:14 +01:00
simibubi
dd95096bfa Smart Fluid Pipes
- Added craftable pipes with filtering capabilities
- Added missing recipe for the Portable Storage Interface
2020-10-17 18:20:05 +02:00
Zelophed
bbe7ef820d Merge branch 'mc1.15/dev' into mc1.16/dev 2020-10-17 17:33:54 +02:00
Zelophed
7ef31b9053 Spooky Filters
- allow our filters to be populated from JEIs ghost-ingredients
2020-10-17 17:32:37 +02:00
Colman Davenport
083a9c1140 Refactor FluidContentsAttribute 2020-10-17 11:24:15 -04:00
Colman Davenport
42ef3796a2 Refactor EnchantAttribute 2020-10-17 11:23:38 -04:00
Colman Davenport
6d51a6c730 Astral Sorcery Attributes 2020-10-17 01:25:29 -04:00
Colman Davenport
822ca6dad6 Lang 2020-10-17 01:17:25 -04:00
Colman Davenport
562abdea31 Written Book Attributes 2020-10-17 01:16:32 -04:00
Colman Davenport
c1bb1e64c9 Custom Name Attributes 2020-10-17 00:58:49 -04:00