Commit Graph

133 Commits

Author SHA1 Message Date
simibubi
c85efe141f Soulfire heating
- Integrate #724 on correct branch and through use of the data generator
2021-02-05 18:49:10 +01:00
simibubi
bf73a24401 Merge branch 'mc1.15/dev' into mc1.16/dev 2021-01-04 14:15:53 +01:00
simibubi
a1cac6d852 Why are we still here, 1.16 Special
- Removed invalid compat recipe containing a removed item from the mod "Charm"
- Added sawing recipes for Crimson and Warped stems
- Adjusted crushing outputs of nether wart blocks
- Fixed Deployers unable to break leaves and other specific translucent blocks
- Saws and Deforesters can now take down Crimson and Warped fungus
2021-01-03 23:35:03 +01:00
simibubi
1498cb1cfc Why are we still here, Part IV
- Mixers can no longer process single-item recipes
- Added processing recipes for items in AE2
- Fixed pams harvestcraft recipe catalysts not recycling properly
- Windmill bearings no longer assemble when the attached kinetics update
- Hose pulleys now display additional goggle info when their target fluid body is considered infinite
- Protected the natural scoria model from vertex-format changes made by optifine
- Andesite tunnels now split off single items to side outputs
- Fixed non-interpolated item animation on the Mechanical Saw
- Attempted fix to oriented contraption causing serialization issues
- Fixed mounted contraptions not updating yaw interpolation when stalled
- Fixed "shifting gears" advancement not triggering when using the cogwheel placement assist
- Schematicannons no longer cause pasted kinetic networks to be virtually interconnected
- Added sandstone -> sand; milling/crushing recipe
- Fixed Spouts duplicating container items in some configurations
- Fixed block cutting recipe outputs piling up beyond the gui boundaries
2021-01-03 22:29:55 +01:00
garyantonyo
089ed5ca6f Adding support for Ice and Fire silver and copper, even though Ice and Fire does not support Create... 2021-01-01 22:46:04 -05:00
garyantonyo
76c17d32e2 add lead crushed ore recipes when Eidolon present 2020-12-31 02:06:57 -05:00
simibubi
788f92705d Why are we still here
- Added chocolate and tea fluid tag #580
- Fixed item drain accepting stacks of items to empty
- Fixed basins mistakingly ignoring recipes with 4 or 9 equal ingredients
- Fixed schematicannon not able to place glass pipes, encased pipes, belt funnels and encased shafts
- Fixed race condition with other mods registering spawn eggs
- Belts no longer consume dye
- Tweaked placement constraints and control of cogwheels
- Chocolate and honey buckets can no longer stack
- Minecarts can now collide with non-mounted contraptions
- Attempted some optimizations to contraption lighting
2020-12-27 23:09:19 +01:00
Snownee
49b5e4957e Fix a typo 2020-12-25 18:11:13 +08:00
simibubi
ecd5858ece Merge branch 'mc1.15/dev' into mc1.16/dev 2020-12-18 18:36:51 +01:00
simibubi
6c6760ef17 More content, who dis?
- Sprite touch-ups by vectorwing
- Builders Tea
- Bar of Chocolate
- Fixed spouts not rendering fluid particles of virtual fluid types
- Fixed spouts filling bottles inconsistently
2020-12-18 15:13:57 +01:00
simibubi
6f9ee792f4 Port recent changes 2020-12-15 23:22:12 +01:00
simibubi
67cb69aaea Merge branch 'mc1.15/dev' into mc1.16/dev 2020-12-15 23:21:52 +01:00
simibubi
1840b40e2e Advancing toward the day
- Added advancements for exploring the content
- Adjusted some recipes
2020-12-15 21:16:17 +01:00
simibubi
78036195ab Merge branch 'mc1.15/dev' into mc1.16/dev 2020-12-13 15:33:45 +01:00
simibubi
d68d702b3a Fun with Recipes
- Added a couple of recipes involving fluids and things
2020-12-13 15:17:31 +01:00
simibubi
4b597f7b86 Mek has more metals now
- Also reduced speed penalty of coupling hard-collision
2020-12-12 17:57:48 +01:00
simibubi
7760db875c Merge branch 'mc1.15/dev' into mc1.16/dev 2020-12-12 17:42:12 +01:00
simibubi
45465fb69b Minor adjustments
- Fluid tanks are not nbt safe
- Mekanism uses reversed ids
2020-12-12 17:33:16 +01:00
simibubi
a26988db70
Merge pull request #533 from Creators-of-Create/mc1.15/safe-nbt
Safe NBT tag
2020-12-12 15:37:44 +01:00
Snownee
f64dc8c43f Signs are not nbt-safe, due to the ability to execute command 2020-12-12 19:10:59 +08:00
Snownee
1a052d1ec1 Tag data-gen 2020-12-12 05:00:25 +08:00
simibubi
42215b8eb0 Merge branch 'mc1.15/dev' into mc1.16/dev 2020-12-11 21:23:31 +01:00
simibubi
2744cabf14 How to 0.3
- Updated and Finished up remaining item/block tooltips
- Encased belts are now called encased chain drives for easier distinction
2020-12-11 19:36:13 +01:00
simibubi
17ba73dedf Thermal compat
- Apparently this mod is still a thing
2020-12-11 13:02:04 +01:00
4de7c118f4 merge and port. I WANT IT NOOOOW! 2020-12-05 11:42:14 +01:00
simibubi
9e4b92babf Other options are available
- Added a handful of crushed ore compatibility (+spicy datagen)
- Lapis sheets are now tagged
2020-12-04 18:10:07 +01:00
simibubi
16705c5cb5 A flock of fluids
- Added Fluids for chocolate, honey, milk and tea
2020-12-03 20:41:55 +01:00
simibubi
e3bef624a0 Casing case closed
- Encased shafts and gearboxes can now join textures with respective casing blocks
- Added back encased shaft items for creative mode
- Fixed encased shafts able to be created with casing and cogs
2020-12-02 21:49:57 +01:00
simibubi
da5aaebe1b Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2020-11-30 15:26:43 +01:00
simibubi
ccae111ec8 Reversing the reversed
- Controller rails can now control furnace minecarts
- Controller rails now snap to adjacent rails with the correct facing
- Controller rails no longer get reversed when transitioning to or from a slope in certain orientations
- Controller rails are now craftable
- Fun refactors
- Updated texture
- Recipe adjustments
2020-11-30 15:23:37 +01:00
628afa52d1 Fix cocoa beans on contraptions crashing the server 2020-11-30 13:23:35 +01:00
59e377c7ef merge recent changes 2020-11-30 09:48:38 +01:00
tterrag
696393ec41 Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.16/dev
# Conflicts:
#	src/generated/resources/.cache/cache
#	src/generated/resources/assets/create/lang/unfinished/de_de.json
#	src/generated/resources/assets/create/lang/unfinished/fr_fr.json
#	src/generated/resources/assets/create/lang/unfinished/it_it.json
#	src/generated/resources/assets/create/lang/unfinished/ja_jp.json
#	src/generated/resources/assets/create/lang/unfinished/ko_kr.json
#	src/generated/resources/assets/create/lang/unfinished/nl_nl.json
#	src/generated/resources/assets/create/lang/unfinished/pt_br.json
#	src/generated/resources/assets/create/lang/unfinished/ru_ru.json
#	src/generated/resources/assets/create/lang/unfinished/zh_cn.json
#	src/main/java/com/simibubi/create/content/contraptions/base/GeneratingKineticTileEntity.java
#	src/main/java/com/simibubi/create/content/contraptions/base/IRotate.java
#	src/main/java/com/simibubi/create/content/contraptions/base/KineticTileEntity.java
#	src/main/java/com/simibubi/create/content/contraptions/relays/gauge/SpeedGaugeTileEntity.java
#	src/main/java/com/simibubi/create/content/contraptions/relays/gauge/StressGaugeTileEntity.java
#	src/main/java/com/simibubi/create/content/logistics/block/chute/ChuteTileEntity.java
#	src/main/java/com/simibubi/create/foundation/item/ItemDescription.java
2020-11-28 17:24:30 -05:00
0231b32866 Someone get those damn mine carts under control!! 2020-11-28 21:12:31 +01:00
simibubi
e7a22c96e9 Funnels for everybody
- Fixed flapfunnels not taking secondary items off depots
- Funnels can now sit horizontally on saws and drains
- Added a recipe from natural to regular scoria
2020-11-27 17:19:11 +01:00
simibubi
757b65f136 All caught up
- Port recent changes to 1.16
2020-11-26 00:57:50 +01:00
simibubi
e8edbcdb11 Merge branch 'mc1.15/dev' into mc1.16/dev 2020-11-26 00:57:29 +01:00
simibubi
8ff98dc3fb Fluid Delivery
- Fluid Tanks and Creative Fluid Tanks now form a combined fluid inventory on contraptions
- Added the Portable Fluid Interface
- Fixed tanks placed with nbt not clamping their contained fluids
- Item Storage information on Contraptions no longer get sent to the client
- Combined fluid storage synchronizes to the client and applies new contents to the corresponding mounted TE renderers
- Fixed motion of dripping potion particles from fluid pipe flow indication
- Portable Storage interfaces now interrupt their connection when receiving redstone power
2020-11-25 18:54:59 +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
simibubi
e4fa2de11e PR dusting
- Some lang fixes/adjustments
- runData
2020-11-14 22:53:15 +01:00
simibubi
d383965618
Merge pull request #503 from Snownee/mc1.15/snownee
Bug fixes
2020-11-14 22:10:16 +01:00
9ea09aef4c merge recent progress to 1.16 2020-11-14 15:22:32 +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
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
Snownee
1afab1dd51 Fix slab loot tables 2020-11-11 00:57:29 +08:00
Snownee
5958370900 Give ProcessingOutput a default count 2020-11-08 17:30:40 +08:00
Snownee
073e3980ee Fix water rendering overlay on glass blocks 2020-11-08 16:29:58 +08:00
simibubi
0a98171384 Merge branch 'mc1.15/dev' into mc1.16/dev 2020-11-06 20:49:00 +01:00