4548 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Jozufozu	b92f52c779	Right in the wheels ... - Combine water wheel models in visuals between axes - Add WaterWHeelRenderer.Variant to distinguish between small, large, and large extension models - Move WaterWheelModelKey back into WaterWheelRenderer - Add separate WaterWheelVisual.ModelKey because it needs less data - Combine encased cog models between axes - Move MixerVisual to extend SingleAxisRotatingVisual	2025-01-18 12:27:11 -06:00
Kryppers	ae04f58dcb	brass tacks ... updated brass sheet asset	2025-01-18 18:24:07 +00:00
IThundxr	e261439c63	Merge branch 'mc1.20.1/feature-dev' into mc1.21.1/dev	2025-01-18 13:07:17 -05:00
simibubi	fa17dd851e	Split personality ... - Fix chain riding players not animating the hat layer - Registered new rare packages to show in game - Players now dismount from chain conveyors if they unequip the wrench - Packages on belts no longer all face the same direction - Brass tunnels now try to distribute an item more quickly when it first arrives	2025-01-18 18:24:32 +01:00
Kryppers	1135b287a2	bit more yellow ... tweaked linked packager colours	2025-01-18 15:48:42 +00:00
simibubi	3d90f2c516	Postmerge	2025-01-18 15:47:16 +01:00
simibubi	a9c32950ae	Merge branch 'mc1.20.1/feature-dev' of https://github.com/Creators-of-Create/Create-Concealed into mc1.20.1/feature-dev	2025-01-18 15:47:06 +01:00
simibubi	d520e32ed1	Put the baubles back on ... - New assets for Stock links and Display links - New particle effect for logistics networks - Removed ponder placeholder tooltips	2025-01-18 15:30:25 +01:00
zelophed	071c3969f5	merge mc1.20.1/feature-dev & bump ponder version	2025-01-18 15:21:02 +01:00
zelophed	2141e69aa2	Merge remote-tracking branch 'origin/mc1.20.1/feature-dev' into mc1.20.1/merge-catnip ... # Conflicts: # build.gradle # src/main/java/com/simibubi/create/AllPartialModels.java # src/main/java/com/simibubi/create/content/kinetics/base/ShaftVisual.java # src/main/java/com/simibubi/create/content/kinetics/base/SingleRotatingVisual.java # src/main/java/com/simibubi/create/content/kinetics/crank/HandCrankVisual.java # src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerActorVisual.java # src/main/java/com/simibubi/create/content/kinetics/fan/processing/AllFanProcessingTypes.java # src/main/java/com/simibubi/create/content/kinetics/flywheel/FlywheelVisual.java # src/main/java/com/simibubi/create/content/kinetics/saw/SawVisual.java # src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelModel.java	2025-01-18 15:04:48 +01:00
IThundxr	531a5725eb	Merge branch 'mc1.20.1/feature-dev' into mc1.21.1/dev ... # Conflicts: # src/main/resources/data/create/structures/gametest/contraptions/arrow_dispenser.nbt # src/main/resources/data/create/structures/gametest/contraptions/controls.nbt # src/main/resources/data/create/structures/gametest/contraptions/crop_farming.nbt # src/main/resources/data/create/structures/gametest/contraptions/elevator.nbt # src/main/resources/data/create/structures/gametest/contraptions/mounted_fluid_drain.nbt # src/main/resources/data/create/structures/gametest/contraptions/mounted_item_extract.nbt # src/main/resources/data/create/structures/gametest/contraptions/ploughing.nbt # src/main/resources/data/create/structures/gametest/contraptions/redstone_contacts.nbt # src/main/resources/data/create/structures/gametest/contraptions/roller_filling.nbt # src/main/resources/data/create/structures/gametest/contraptions/roller_paving_and_clearing.nbt # src/main/resources/data/create/structures/gametest/contraptions/train_observer.nbt # src/main/resources/data/create/structures/gametest/fluids/3_pipe_combine.nbt # src/main/resources/data/create/structures/gametest/fluids/3_pipe_split.nbt # src/main/resources/data/create/structures/gametest/fluids/hose_pulley_transfer.nbt # src/main/resources/data/create/structures/gametest/fluids/in_world_pumping_in.nbt # src/main/resources/data/create/structures/gametest/fluids/in_world_pumping_out.nbt # src/main/resources/data/create/structures/gametest/fluids/large_waterwheel.nbt # src/main/resources/data/create/structures/gametest/fluids/small_waterwheel.nbt # src/main/resources/data/create/structures/gametest/fluids/smart_observer_pipes.nbt # src/main/resources/data/create/structures/gametest/fluids/steam_engine.nbt # src/main/resources/data/create/structures/gametest/fluids/waterwheel_materials.nbt # src/main/resources/data/create/structures/gametest/items/andesite_tunnel_split.nbt # src/main/resources/data/create/structures/gametest/items/arm_purgatory.nbt # src/main/resources/data/create/structures/gametest/items/attribute_filters.nbt # src/main/resources/data/create/structures/gametest/items/belt_coaster.nbt # src/main/resources/data/create/structures/gametest/items/brass_tunnel_filtering.nbt # src/main/resources/data/create/structures/gametest/items/brass_tunnel_prefer_nearest.nbt # src/main/resources/data/create/structures/gametest/items/brass_tunnel_round_robin.nbt # src/main/resources/data/create/structures/gametest/items/brass_tunnel_single_split.nbt # src/main/resources/data/create/structures/gametest/items/brass_tunnel_split.nbt # src/main/resources/data/create/structures/gametest/items/brass_tunnel_sync_input.nbt # src/main/resources/data/create/structures/gametest/items/depot_display.nbt # src/main/resources/data/create/structures/gametest/items/smart_observer_belt_and_funnel.nbt # src/main/resources/data/create/structures/gametest/items/smart_observer_chutes.nbt # src/main/resources/data/create/structures/gametest/items/smart_observer_counting.nbt # src/main/resources/data/create/structures/gametest/items/smart_observer_filtered_storage.nbt # src/main/resources/data/create/structures/gametest/items/smart_observer_storage.nbt # src/main/resources/data/create/structures/gametest/items/storages.nbt # src/main/resources/data/create/structures/gametest/items/threshold_switch.nbt # src/main/resources/data/create/structures/gametest/items/vault_comparator_output.nbt # src/main/resources/data/create/structures/gametest/misc/netherite_backtank.nbt # src/main/resources/data/create/structures/gametest/misc/schematicannon.nbt # src/main/resources/data/create/structures/gametest/misc/shearing.nbt # src/main/resources/data/create/structures/gametest/misc/smart_observer_blocks.nbt # src/main/resources/data/create/structures/gametest/misc/threshold_switch_pulley.nbt # src/main/resources/data/create/structures/gametest/processing/brass_mixing.nbt # src/main/resources/data/create/structures/gametest/processing/brass_mixing_2.nbt # src/main/resources/data/create/structures/gametest/processing/crushing_wheel_crafting.nbt # src/main/resources/data/create/structures/gametest/processing/iron_compacting.nbt # src/main/resources/data/create/structures/gametest/processing/precision_mechanism_crafting.nbt # src/main/resources/data/create/structures/gametest/processing/sand_washing.nbt # src/main/resources/data/create/structures/gametest/processing/stone_cobble_sand_crushing.nbt # src/main/resources/data/create/structures/gametest/processing/track_crafting.nbt # src/main/resources/data/create/structures/gametest/processing/water_filling_bottle.nbt # src/main/resources/data/create/structures/gametest/processing/wheat_milling.nbt	2025-01-17 22:49:18 -05:00
IThundxr	7534920eb3	Looking good ... - Update gametest structure files	2025-01-17 22:45:34 -05:00
IThundxr	9edc952d3a	Merge branch 'mc1.20.1/feature-dev' into mc1.21.1/dev	2025-01-17 22:16:44 -05:00
Jozufozu	24acef316d	Unite them ... - Reduce usage of rotated partial models - Instead use per-instance rotation to reduce draw calls and memory usage - Migrate to RotatingInstance.setup where possible	2025-01-17 16:39:59 -06:00
Jozufozu	6ac654d722	Wrench art online: partialization ... - Remove SingleRotatingVisual and many hyper-specialized subclasses - Add OrientedRotatingVisual and SingleAxisRotatingVisual, which accept a model in the constructor as well as orientation information - Inline the remnants of SingleRotatingVisual into saw visual because it has the most complicated orientation rules - Separate large cogwheel visual from small cog and shaft - Add partial models for every possible gantry shaft blockstate - Move RotatingInstance "setup" logic into RotatingInstance itself	2025-01-17 16:39:59 -06:00
IThundxr	f264657c6b	Merge remote-tracking branch 'concealed/mc1.20.1/feature-dev' into mc1.20.1/feature-dev	2025-01-17 17:02:02 -05:00
IThundxr	7590ef2446	That's mine! ... - Fix item hatches not dropping item filters upon being broken	2025-01-17 17:00:31 -05:00
Kryppers	e8eed60cd0	refining visuals ... updated visuals for linked packager and stock ticker in preparation for new link models.	2025-01-17 21:03:19 +00:00
IThundxr	98e6795bdf	Merge remote-tracking branch 'concealed/mc1.20.1/feature-dev' into mc1.20.1/feature-dev	2025-01-17 11:36:27 -05:00
IThundxr	26250e7d9e	There you are ... - Remove suppliers around FanProcessingType's; we need to often use the objects right away, and or in other parts of the code	2025-01-17 11:36:20 -05:00
zelophed	b04a2828c1	util shuffle ... - refactor and flatten catnip.utility package	2025-01-17 17:27:14 +01:00
zelophed	3fb6e71ec8	remove references to catnip as a mod	2025-01-17 14:52:52 +01:00
Jozufozu	86e14b3828	Partially complete ... - Begin work moving fully to partial models - Add rotateToFace and rotateTo methods to RotatingInstance - Port: - ShaftVisual (pulleys, chain drives, press, etc.) - Saw - Hand crank - Valve handle (now a separate visual) - Rope pulley - Flywheel - Where possible in the above visuals, combine the models from different axes/facings	2025-01-16 19:04:53 -08:00
simibubi	a1bcf6be5f	Final thoughts ... - Ponder scenes for the factory gauge	2025-01-17 00:11:12 +01:00
IThundxr	ed67554b6d	Merge remote-tracking branch 'concealed/mc1.20.1/feature-dev' into mc1.20.1/feature-dev	2025-01-16 15:47:58 -05:00
IThundxr	f3f46827f1	Arts and crafts II ... - Hook up recipe for trimming cardboard armor	2025-01-16 15:47:45 -05:00
Jozufozu	efedee7d48	Confused diffuse ... - Fix bottom of chain conveyor guards not matching the bottom of chain conveyors - Bump flywheel build, add vanillin at runtime	2025-01-16 12:18:45 -08:00
IThundxr	9be39b7f3b	Moving On II	2025-01-16 12:28:44 -05:00
IThundxr	d4ca3db3cd	Can't do that. ... - Mark unmodifiable views with the annotation	2025-01-15 19:09:35 -05:00
simibubi	d86e3b29fc	Ponders wonders ... - Table cloth scene	2025-01-15 19:24:11 +01:00
simibubi	65a47b7724	Keep them pondering ... - Re-packager scene	2025-01-15 16:48:00 +01:00
simibubi	a59c510ad0	Fix broken import	2025-01-15 14:29:39 +01:00
simibubi	54899c03cf	He who ponders ... - Redstone requester ponder scene	2025-01-14 23:19:43 +01:00
Kryppers	90832f471e	Now you're thinking with pipes ... updated smart pipe textures	2025-01-14 19:58:05 +00:00
IThundxr	28ca976cd4	Cat in the box	2025-01-14 14:10:52 -05:00
IThundxr	e86b080017	What a bad mix up ... - Fix accessors by removing and replacing with method handles/AT's	2025-01-14 11:54:09 -05:00
simibubi	fcc862264d	Never scene before ... - Ponders for Stock link and Stock ticker	2025-01-14 14:25:48 +01:00
IThundxr	7c91e6a213	Odd block choices ... - Implement a tag to mark items as invalid for paving	2025-01-13 10:11:01 -05:00
GG3Hahn	7a7993deb8	Add pressing recipes for coarse and rooted dirt (#7186)	2025-01-13 10:01:33 -05:00
VoidLeech	67085963d0	fix: cactus milling getting disabled when quark is loaded (#7215)	2025-01-13 10:00:03 -05:00
Cody	c1a7a18968	Sugar Cane Variants tag (#7263)	2025-01-13 09:58:25 -05:00
IThundxr	a969928be4	Merge remote-tracking branch 'concealed/mc1.20.1/feature-dev' into mc1.20.1/feature-dev	2025-01-13 09:51:20 -05:00
IThundxr	4b69bfc0dc	Consistent Consistency ... - Make bar and window models consistent with vanilla's models	2025-01-13 09:51:13 -05:00
Kryppers	52e9668540	further asset additions ... added rare_thunder asset	2025-01-13 14:45:43 +00:00
Ginger	0f9ba22aa2	Fix calls to getSize() on display link peripheral failing when the peripheral is newly loaded (#7059)	2025-01-13 09:41:57 -05:00
IThundxr	56faba5fea	Magic recipes ... - Implement a system for generating recipes at runtime to improve mod compat	2025-01-12 21:02:28 -05:00
IThundxr	a70ab4ef63	Refmap Referee ... - Fix refmap not being remapped	2025-01-12 18:05:58 -05:00
IThundxr	fdc069910c	Mixed up errors ... - Fix	2025-01-12 17:46:01 -05:00
embeddedt	be026ece02	Drain category improvements (#7277)	2025-01-12 16:51:13 -05:00
IThundxr	3f3f5a3c24	Eclipsed moon again ... - Disable config cache, doesn't support eclipse yet	2025-01-12 16:44:32 -05:00