Commit graph

434 commits

Author SHA1 Message Date
Bob Dole
c739fdbb09 Resolved merge conflicts - Does not Build 2020-10-30 03:06:15 -04: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
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
89bad1c192 Add Attribute Filter Lang back in 2020-10-21 19:18:29 +02:00
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
420501af89 Fix Server crash on chromatic compound conversion 2020-10-21 01:03:27 +02:00
simibubi
41148a5e39 Merge branch 'mc1.15/dev' into mc1.16/dev 2020-10-20 21:02:50 +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
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
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
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
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
b5802bb0e8 Merge branch 'mc1.15/dev' into mc1.16/dev
# Conflicts:
#	src/generated/resources/.cache/cache
#	src/main/java/com/simibubi/create/compat/jei/CreateJEI.java
#	src/main/java/com/simibubi/create/compat/jei/category/MechanicalCraftingCategory.java
#	src/main/java/com/simibubi/create/compat/jei/category/MixingCategory.java
2020-10-16 19:11:29 +02:00
Zelophed
a2e4cfb66d fixup! Split mixing and mechanical crafting categories 2020-10-16 18:58:35 +02:00
simibubi
69cbfff8ed Merge branch 'mc1.15/dev' into mc1.16/dev 2020-10-14 21:06:46 +02:00
simibubi
62434fd564 That's hot
- Better JEI documentation of heat levels
- Remapped / Adjusted a few tooltips
- Fixed fan processing on item entities happening on both logical sides
2020-10-14 20:52:38 +02:00
277e4ea9d1 Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev 2020-10-14 16:37:27 +02:00
6200329e43 Fix botania petal milling 2020-10-14 16:36:53 +02:00
Kryppers
40c4059b75 Tooltips? more like Cool-tips!
Fixed a couple of spelling errors.
Added a bunch of Tooltips.
2020-10-13 23:59:02 +01:00
simibubi
f2acea7f77 Merge branch 'mc1.15/dev' into mc1.16/dev 2020-10-13 20:57:30 +02:00
simibubi
d973e9bcdd JEI fixes
- Fluids in JEI now display the exact amount required
- Fixed short background of custom compacting JEI
- Fixed localization of sawing recipe category
- Fixed blocks waterlogged by a pump not scheduling a fluid update
2020-10-13 20:39:44 +02:00
Colman Davenport
a28b6bbdc3 Overhaul mechanical saw rendering
- Saws no longer use "RUNNING" blockstate
- Sawblade animates based on input speed
- Saws properly stop animating when inactive
2020-10-12 23:25:35 -04:00
simibubi
cbeb5dc649 Merge branch 'mc1.15/dev' into mc1.16/dev 2020-10-12 22:15:32 +02:00
simibubi
afa94c3e77 Blazier updates
- Fixed some sync & block update issues with blaziers
- Changed the fuel pellet item
- JEI can now display fluid in- and outputs of basin recipes
2020-10-12 21:55:09 +02:00
simibubi
df5008e7fd Merge branch 'mc1.15/dev' into mc1.16/dev 2020-10-12 16:25:46 +02:00
woow101
cbd59871cc
Update advancements.json
Fixed an error in the edit.
2020-10-12 03:12:19 -05:00
woow101
895131ad72
Update advancements.json
Edits to several advancement titles and descriptions for errors and consistency.
2020-10-12 02:28:28 -05:00
1a4814e724 merge mc1.15/dev into mc1.16/dev 2020-10-10 21:46:40 +02:00
simibubi
3956875334 The Coupling Capability
- Fixed concurrency / race condition issues with contraptions loading in during a collision cycle
- Reworked implementation model of minecart tracking and couplings
- Coupling items now get consumed when used in survival mode
- Added some player feedback when couplings cannot be created
- Fixed couplings disappearing on the client due to sync issues
- Wrenches can now remove minecarts in one hit
- Wrenches can now be used to remove couplings from minecarts
- Cart assemblers now attach themselves to the block above, no longer requiring active "sticky-ness" of the contraption towards it
- Minecarts can no longer be moved while a contraption is stalling them
2020-10-08 20:13:17 +02:00
36a96d35e3 fix some rendering to use matrix stacks 2020-10-07 22:32:03 +02:00
b9476b58ce bare basin business, but 1.16 2020-10-06 21:42:31 +02:00
simibubi
378164b8b9 More unfinished basin business
- Fixed players flailing their limbs around while standing still on a moving contraption
- Attempted to reduce drag of remote player positions while on a contraption
- Contraptions no longer log out with the player riding them
- Attribute filters are now made of brass
- Added the ability to disable auto-compat with vanilla recipe types in the configs
- Added a recipe type for custom basin/press compacting
- Basins can now process items and liquids in recipes
- Input items/fluids of a basin can now be extracted or reused in further processing
- A basin diagonally below another basin with collect outputs of recipes processed in the top basin for ease of automation
- (Temporary debug recipes)
2020-10-06 20:43:13 +02:00
31e35d060f fixed merge conflicts 2020-10-04 01:08:13 +02:00
tterrag
e5179598e3 Get things running, fix forge/mc dependencies and extendo grip 2020-10-03 17:12:32 -04:00
simibubi
b14e94929c Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2020-10-02 14:41:49 +02:00
simibubi
334bde9de5 Quality
- Visual rework of all active UIs
- Fixed large scale renderers such as belts, cannons, pulleys to disappear when partially out of frame
- Schematic and Quill now has the ability to convert a selection to a readied schematic instantly
- Moved option input of cart assemblers to side faces
- Fixed crash when attempting to smelt items on belts/depots
- Stockpile switches can now be inverted
- Fixed stockpile switches not dynamically updating gui indicators frequently enough
- Tanks can no longer be directly interacted with in survival mode
- Sequenced gearshifts now emit a comparator signal based on their current instruction index
- The Piston instruction for sequencers can now accept distances up to 128m
- Fixed some rendering inconsistencies with symmetry mirrors
- Reworked symmetry mirror models to match the tool better
- Attribute filters can now add inverted conditions to the list
- Added the attribute "can be crushed"
- Made the schematicannon interface a little less confusing
- Fixed launched items of the schematicannon rendering warped
2020-10-02 14:28:48 +02:00
d5f2d9b101 fruit loops 2020-10-01 18:49:40 +02:00
simibubi
6e285e2f8b Valves and Valve handles
- Added a straight pipe variant to cut flows using rotational input
- Added a slower more precise variant of the hand crank
- Basins now render their contained fluids
2020-09-25 17:22:16 +02:00
92a6e32b19 Fixed some more stuff 2020-09-24 16:17:16 +02:00