2296 commits

Author	SHA1	Message	Date
JozsefA	536b8d2d5e	Fix transparent contraption parts rendering strangely ... - It was rendering as if it existed with your hand.	2021-04-09 15:23:51 -07:00
JozsefA	f2c6afdcb3	Fix projection matrix bug ... - Copy the projection matrix when vanilla would be uploading it to GL. - This should account for just about everything. Unrelated to the fix: - Shader programs now have more flexibility in specialization. - Accomplished with IMultiProgram. - Remove unnecessary SHADER_DEBUG_OUTPUT boolean.	2021-04-09 14:48:44 -07:00
simibubi	edb1b59f41	Housekeeping ... - Added an .editorconfig - Auto-Reformatted most .java files - Auto-Organized Imports	2021-04-08 19:22:11 +02:00
zelophed	f9179b3b1d	animated colors	2021-04-07 18:47:19 +02:00
zelophed	b1773e9e6b	shadow cog	2021-04-07 15:18:37 +02:00
grimmauld	b10203db01	Extract block breaking in TreeCutter.Tree to AbstractBlockBreakQueue for better reusability and option of saw passing a different item	2021-04-07 15:13:07 +02:00
grimmauld	ac8c1e1468	Fixed unported stuff, tree cutter now does sound effects at the right probability again	2021-04-07 14:29:41 +02:00
grimmauld	2613c5be89	Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev	2021-04-07 14:07:13 +02:00
grimmauld	f19c6ab763	- Deforester now hits forge hooks for tool break, block break, times used. ... -Moved deforester not loosing durability from leaves to DeforesterItem instead of Tree mining - added destroyBlocks method in TreeCutter$Tree for less doubled code - Mechanical Saws currently break the tree with an empty "hand" as they did before - Silktouch and Fortune enchants are now being applied from deforesters	2021-04-07 14:07:06 +02:00
simibubi	525001e410	Merge branch 'mc1.15/dev' into mc1.16/dev	2021-04-07 12:36:39 +02:00
simibubi	ffa19dd354	Update data, move misplaced localization file	2021-04-07 12:00:00 +02:00
simibubi	c46e286844	Update Localization Readme.txt	2021-04-07 11:38:11 +02:00
simibubi	79bc9d35e1	Merge pull request #1348 from Hanqnero/ru-localization ... Added some missing Ru localization	2021-04-07 11:37:29 +02:00
simibubi	1bc32d4b80	Merge pull request #1355 from Peatral/mc1.15/dev ... Update de_de.json	2021-04-07 11:29:30 +02:00
JozsefA	f2b064fa49	Instanced rope pulleys ... - The "magnet" texture is broken	2021-04-06 23:17:16 -07:00
zelophed	7ad0575618	fancy text	2021-04-07 02:17:55 +02:00
JozsefA	4b49763e0c	Got a weird crash profiling the slideshow machine ... - Seems to be a race condition, try/catch should be good enough	2021-04-06 16:52:34 -07:00
JozsefA	40bdbc7048	Instanced rope pulleys	2021-04-06 16:46:24 -07:00
JozsefA	3a52fa573f	Merge branch 'mc1.15/dev' into mc1.15/pulley-instance	2021-04-05 23:44:27 -07:00
JozsefA	7a1445f00a	Fix nullpointer with starlight	2021-04-05 23:43:39 -07:00
JozsefA	4ae1ce3dbe	Don't crash with starlight	2021-04-05 23:23:35 -07:00
zelophed	d4994ddc8b	entry point	2021-04-06 00:05:29 +02:00
Christof	cbabd943fd	Typo ... Whoops	2021-04-05 16:39:03 +02:00
Christof	330777045e	Update de_de.json ... Added missing blocks and GUI stuff and fixed typos. Now only - Most advancements - A lot of block summaries/tooltips - All of the pondering - All attributes are missing	2021-04-05 16:15:00 +02:00
Hanqnero	ab4c0100a4	Fixed misspelling	2021-04-04 23:07:58 +05:00
Hanqnero	eb8e610743	Update ru_ru.json ... Added some missing Ru Localization 102 added in total	2021-04-04 22:46:13 +05:00
JozsefA	3b05e06d35	Merge branch 'mc1.15/dev' into mc1.16/dev	2021-04-03 18:45:23 -07:00
JozsefA	c55351e980	Fix nullpointer with starlight	2021-04-03 18:33:47 -07:00
simibubi	19020b39bf	Merge branch 'mc1.15/dev' into mc1.16/dev	2021-04-04 01:53:50 +02:00
simibubi	3da35a30e3	Version up	2021-04-04 01:52:55 +02:00
simibubi	9dc528d96c	Merge branch 'mc1.15/dev' into mc1.16/dev	2021-04-04 01:30:18 +02:00
simibubi	b05a03d417	Update NixieTubeBlock.java ... - Revert rushed solution to auto nixie control	2021-04-04 01:30:01 +02:00
simibubi	307241e7fd	Port new Changes	2021-04-04 00:58:23 +02:00
simibubi	47bd1d9c93	Merge branch 'mc1.15/dev' into mc1.16/dev	2021-04-04 00:58:14 +02:00
zelophed	e8338d4805	too much backtracking	2021-04-04 00:36:31 +02:00
JozsefA	9d99a5f968	Compromise for render bounding box caching ... - Recalculating it once per tick is better than doing it every frame. - Only ever doing it once has proven unreliable.	2021-04-03 15:08:06 -07:00
simibubi	62b1fe82b7	Fix-ups Cont'd ... - Fixed Spawners losing nbt data when moved - Nixie tubes now update their texts starting from the clicked block, rather than the leftmost one in the chain - Fixed inconsistency between block and item model of the furnace engine	2021-04-03 23:49:59 +02:00
JozsefA	ba91eaa4ef	Probably fix ghost hands appearing by the player	2021-04-03 14:23:00 -07:00
simibubi	b845809b58	The great Escape ... - Adresses #1324	2021-04-03 19:50:42 +02:00
simibubi	69c3a57c76	Quell the outrage! ... - Placement indicator arrow is slightly smaller by default	2021-04-03 19:46:26 +02:00
simibubi	d1c8ad38fc	Chute extraction refactor	2021-04-03 19:41:33 +02:00
simibubi	9ab5c74929	Merge pull request #1340 from sarim/mc1.15/dev ... allow smart chute to transfer whole stacks	2021-04-03 19:31:16 +02:00
simibubi	1fd6b4360c	Performant fictional entities ... - Fixed crash with the Performant mod when entities are present in a ponder scene	2021-04-03 19:30:38 +02:00
simibubi	83e7074f12	Hot Fix-ups ... - Change to proper key handling for closing create screens - Fixed inconsistent collection behaviour of in-world funnels	2021-04-03 18:59:10 +02:00
simibubi	f528520a53	Destructive Pondering ... - Fixed a couple overlooked ponder lang issues - Fixed weighted ejector not accepting arbitrary gold plates in its recipe - Fix crash opening ponder from screens with an opened recipe book	2021-04-03 18:33:48 +02:00
simibubi	747849d52e	Merge branch 'mc1.16/dev' of https://github.com/Creators-of-Create/Create into mc1.16/dev	2021-04-03 17:55:08 +02:00
simibubi	72789caa01	0/10 not ported ... - Fixed text wrapping on ponder text elements	2021-04-03 17:55:06 +02:00
Sarim Khan	463854a2c0	allow smart chute to transfer whole stacks	2021-04-03 21:53:39 +06:00
JozsefA	75f2516408	Hopefully fix ServerWorld class cast exception ... - Avoid changing Entity.world, maintain contraption related state in the mixin. - Add a mixin to playSound to shift the position of the sound.	2021-04-03 00:42:21 -07:00
zelophed	809bc6bf88	merge and port	2021-04-03 01:16:14 +02:00
zelophed	e05eb5c386	Merge branch 'mc1.15/dev' into mc1.16/dev ... # Conflicts: # src/main/java/com/simibubi/create/foundation/config/CClient.java # src/main/java/com/simibubi/create/foundation/utility/placement/PlacementHelpers.java	2021-04-03 01:00:57 +02:00
zelophed	7a6b1c6949	0.3.1 hotfixes, part I	2021-04-03 00:54:28 +02:00
JozsefA	5abc1e0fe7	Instanced pulleys first pass	2021-04-02 13:38:28 -07:00
simibubi	ab147722d5	Update ja_jp.json	2021-04-02 22:27:44 +02:00
simibubi	c7a3464151	Merge branch 'mc1.15/dev' into mc1.16/dev	2021-04-02 22:27:37 +02:00
zelophed	19862d4341	Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev	2021-04-02 22:15:11 +02:00
zelophed	2b00602446	append, not add	2021-04-02 22:14:40 +02:00
simibubi	f17a804f43	post-PR datagen	2021-04-02 21:09:40 +02:00
simibubi	7193b5b0c2	Merge pull request #1149 from RakuGaki-MC/mc1.16/dev ... [mc1.16/dev] Update ja_jp.json	2021-04-02 21:00:07 +02:00
simibubi	c5f3d4413d	Merge pull request #1322 from Peatral/mc1.15/dev ... Update de_de.json	2021-04-02 20:58:29 +02:00
simibubi	b1bec1a1f9	Fix-ups ... - Filterless Creative Crates now serve as universal supply to schematic-driven deployers - An attempt to force-update ejectors to not miss out on lid animations - Fixed schematic-driven deployers not copying safe nbt data	2021-04-02 19:22:41 +02:00
simibubi	c82896998c	Merge pull request #1216 from mrh0/mc1.15/dev ... Improved modding support	2021-04-02 18:56:20 +02:00
Christof	1d31271bcb	Update de_de.json ... Typos and Gabelstein = Gabbro	2021-04-02 18:23:11 +02:00
Christof	8dbfd4877e	Update de_de.json ... Added the translations for a lot of blocks and a few advancements	2021-04-02 18:07:53 +02:00
simibubi	6cfbf26f49	Merge branch 'mc1.15/dev' into mc1.16/dev	2021-04-01 17:46:07 +02:00
simibubi	6c942be7f5	Too slippery ... - Sliding on contraptions now takes its slope into account - Gantry Carriages are now less prone to break when moved near other blocks	2021-04-01 17:43:39 +02:00
JozsefA	4b00562daf	Port to 1.16	2021-03-31 21:44:16 -07:00
JozsefA	4908fc1b96	Change some obfuscated variable names	2021-03-31 21:29:17 -07:00
JozsefA	78fbb52ddc	Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.16/dev ... # Conflicts: # src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionCollider.java # src/main/java/com/simibubi/create/content/curiosities/TreeFertilizerItem.java	2021-03-31 21:17:01 -07:00
JozsefA	c21a8bcbde	Fix startup crash on some AMD drivers. ... - The fix comes from Grondag's work on canvas. - Original commit: 820bf75409	2021-03-31 20:53:02 -07:00
JozsefA	6ef88c3bd8	Fix some issues with instance rate limiting	2021-03-31 16:25:59 -07:00
JozsefA	b9f6a3b94e	Instanced bearings	2021-03-31 16:19:58 -07:00
JozsefA	b743e00978	Better lazy arm instances	2021-03-31 16:18:53 -07:00
grimmauld	240510e3ee	Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev	2021-03-31 21:18:43 +02:00
grimmauld	3cc8291b72	Simpler bouncing? Thanks @K1521	2021-03-31 21:18:33 +02:00
Snownee	c02193233b	Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/dev	2021-04-01 01:46:52 +08:00
Snownee	ba63cc3e7f	Fix tree fertilizer spreading podzol. Backport a440ab6	2021-04-01 01:43:06 +08:00
simibubi	b6857c2a20	Danger Polish ... - Fixed Crash when Deployer attempts to use Sand Paper	2021-03-31 15:27:57 +02:00
simibubi	e82f9221b7	Merge branch 'mc1.15/dev' into mc1.16/dev	2021-03-31 15:23:18 +02:00
simibubi	5b63f30df3	Abort Mission ... - Drills and other block breakers on contraptions now give up trying to destroy a block when their movement direction is reversed	2021-03-31 15:22:41 +02:00
simibubi	2b4ef88fc1	Merge branch 'mc1.15/dev' into mc1.16/dev	2021-03-31 14:50:16 +02:00
simibubi	d61e387916	The least performant option ... - Fixed slow merging of collision shapes - Improved async handling of the collision shape merger - BBs far away from an entity now get skipped in the collision cycle	2021-03-31 14:27:27 +02:00
JozsefA	65d21c374b	Fix crash making step sounds on servers.	2021-03-30 18:50:07 -07:00
simibubi	0bb18db4b6	Oriented bouncing and sliding ... - Slime blocks on a moving Contraption are now bouncy - Ice blocks on moving Contraptions are now very slippery	2021-03-31 03:16:29 +02:00
JozsefA	376c4e1cb0	Fix crash rendering mechanical crafters on contraptions.	2021-03-30 15:08:42 -07:00
JozsefA	c905aa5e2e	Merge branch 'mc1.15/dev' into mc1.16/dev ... # Conflicts: # src/main/java/com/simibubi/create/content/contraptions/components/flywheel/FlyWheelInstance.java # src/main/java/com/simibubi/create/content/contraptions/components/mixer/MixerInstance.java # src/main/java/com/simibubi/create/content/contraptions/components/press/PressInstance.java # src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/StickerInstance.java # src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionKineticRenderer.java # src/main/java/com/simibubi/create/content/contraptions/relays/gauge/GaugeInstance.java # src/main/java/com/simibubi/create/content/logistics/block/FlapData.java # src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmInstance.java	2021-03-30 14:58:08 -07:00
JozsefA	4ec25798a5	Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev	2021-03-30 14:17:16 -07:00
JozsefA	a2b9dfc28a	Change the locks ... - InstanceKey is no more. - InstanceData and co. keep track of removals and updates. - InstancedModel's buffer management is much more sane now. - Re-add mixin to #tickBlockEntities and ensure compat with Performant. - Move ...backend.instancing.impl to backend.core	2021-03-30 14:14:58 -07:00
simibubi	8a4eaef015	Fix tooltip whitespace	2021-03-30 18:56:22 +02:00
simibubi	9fa63743b6	Merge branch 'mc1.15/dev' into mc1.16/dev	2021-03-30 18:49:13 +02:00
simibubi	ae340ccac0	Spooky ghost honey ... - Fixed pipes drawing non-source honey from beehives - Fixed deployers duplicating glass bottles	2021-03-30 18:48:57 +02:00
simibubi	dba1ff9c34	Port new Changes	2021-03-30 18:34:55 +02:00
simibubi	37c3625d4a	Merge branch 'mc1.15/dev' into mc1.16/dev	2021-03-30 18:34:40 +02:00
simibubi	3a6714fb08	Handy Tweaks ... - Deployers now place block drops into their internal inventory - Deployers can now harvest honey or honeycombs from beehives - Pipes can now connect to and drain liquid honey from beehives	2021-03-30 18:10:24 +02:00
simibubi	389b2e0e90	Ponder fix-ups ... - Input window elements no longer use integer coordinates - Comfy reading is now a config option and persists across ponder UIs - Disabled editor mode	2021-03-30 16:57:21 +02:00
simibubi	c2f3ebbf72	Fix Tooltips on 1.16	2021-03-30 16:32:19 +02:00
JozsefA	ff4a9e5c78	Fix arms glitching out on contraptions. ... - Also provide a hook for subclasses of InstancedTileRenderer to control when specific instances tick.	2021-03-29 15:06:09 -07:00
grimmauld	358ff25031	Fix 1.16 too, i guess	2021-03-29 23:25:28 +02:00
zelophed	0b6098817e	fix some wrench rotation issues	2021-03-29 20:31:08 +02:00
grimmauld	dadde271e4	Fix even more critical crashes, now on schematics	2021-03-29 18:19:17 +02:00
grimmauld	69f4c9f8ad	Fix WrappedWorld.getLightingProvider being null and crashing	2021-03-29 17:19:18 +02:00
grimmauld	90b9a3aff9	Merge & Port	2021-03-29 10:57:50 +02:00
simibubi	5299204fb5	Better Tooltip Integration ... - Removed overlapping tooltips - Adjusted tooltip presentation for more visual consistency	2021-03-28 20:56:55 +02:00
simibubi	bf2a506bb8	A final thought ... - Fixed non-splitting modes on brass tunnels - Ponder scenes for ejectors and tunnels	2021-03-28 18:57:50 +02:00
grimmauld	caa3c57b71	Merge & Port	2021-03-28 10:58:25 +02:00
zelophed	683d18b994	tick off some todos	2021-03-28 04:19:58 +02:00
Kryppers	7de922f239	Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev	2021-03-28 02:13:57 +01:00
Kryppers	1888f2d79b	Update weighted_ejector_casing.png	2021-03-28 02:13:53 +01:00
simibubi	76bd3b3f50	Pondering too fast ... - Added a button to slow down ponder scenes while any text is shown on screen	2021-03-28 01:52:04 +01:00
simibubi	fcae7e5c9a	Motion commotion ... - Update recipe for redstone contact - Counteracted ejector inaccuracies caused by deferred activation - Rewired ponder vertex sorting to evade Optifine incompatibilities	2021-03-28 00:45:14 +01:00
JozsefA	d28e60a059	Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev	2021-03-27 16:38:36 -07:00
JozsefA	4e7777a130	Fix more instancing nonsense. ... OrientedData was still applying the origin position shift, so some things (mechanical presses) wouldn't appear in the right spot.	2021-03-27 16:35:47 -07:00
grimmauld	1739e72af0	Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev	2021-03-28 00:21:13 +01:00
grimmauld	1bffb82ae4	Cogwheel refactor Part III ... - Removed the calls to the AllBlocks entries where necessary - Made placement helpers call the same code as CogWheelBlock.isValidPosition	2021-03-28 00:19:27 +01:00
JozsefA	5f49698a94	Fix mixer weirdness. ... - Mixer and Press instances now use the quaternion shader.	2021-03-27 15:06:56 -07:00
grimmauld	7b022cd302	Cogwheel refactor Part II ... - Refactored getStateForPlacement to reduce doubled code	2021-03-27 23:05:59 +01:00
grimmauld	4ff20b4217	Cogwheel refactor Part I ... - Moved hasIntegratedCogWheel and isSmallCog to ICogWheel	2021-03-27 22:42:27 +01:00
Kryppers	213711ce77	Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev	2021-03-27 21:09:19 +00:00
Kryppers	c239cec8b4	Update weighted_ejector_top.png	2021-03-27 21:09:17 +00:00
simibubi	3dd199e9d9	Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev	2021-03-27 20:15:13 +01:00
simibubi	497ea4bb66	Foolish not to avoid the lack of counteracting no-clip ... - Ejectors now occasionally track launched items, scanning for any obstacles in their trajectory - Fixed rendered items passing an Ejectors' target on clients ticking faster than their server - Removed outdated warnings for 'transposer funnels'	2021-03-27 20:14:55 +01:00
Kryppers	25bc102e92	New contact, who dis? ... updated redstone contact textures.	2021-03-27 19:13:26 +00:00
grimmauld	6e0e3d28fd	Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev	2021-03-27 19:15:57 +01:00
grimmauld	bec6b1d414	Try to make terraforged less angry against Create world gen	2021-03-27 19:15:52 +01:00
zelophed	a5a9ea1b7f	ponder particles, pog	2021-03-27 16:33:23 +01:00
zelophed	c9ba76a2d1	Assisted Placement, Part IV-c ... - indicator renders again - changed the config to allow the indicator to be disabled altogether	2021-03-27 16:01:05 +01:00
JozsefA	fd98bd4976	Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev	2021-03-27 01:10:42 -07:00
JozsefA	a7d714f8ba	Fix for ponder particles yeeting Flywheel rendering. ... I need to isolate the world load/unload stuff for Flywheel anyway, a more robust solution is needed.	2021-03-27 01:10:01 -07:00
grimmauld	5dad567766	Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev	2021-03-27 08:32:32 +01:00
grimmauld	9bc25db615	Keep everything up to date	2021-03-27 08:32:23 +01:00
JozsefA	4675e0ad15	Stop relying on IDynamicInstance#beginFrame to setup instance state. ... - Gantry carriages no longer update when not necessary.	2021-03-26 22:59:47 -07:00
JozsefA	d3d338e64b	STE tick optimization. ... - SmartTileEntity#tick down to 3.32% from 11.64% cpu time. - Measured by JFR over 2 sessions each >8min. - Test world was the deployer fields. - Iterating over HashMap values is slow. - Collect TileEntityBehaviours into a list when the contents of SmartTileEntity#behaviours changes.	2021-03-26 22:02:19 -07:00
JozsefA	cf5eea5a10	Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev	2021-03-26 17:31:41 -07:00
JozsefA	0b25f662dc	Frame rate and tick rate limiting with distance. ... - Significant performance improvement when dealing with massive amounts of dynamic instances, otherwise marginal.	2021-03-26 16:47:37 -07:00
zelophed	7230489b19	placement helper oversight ... - shout-out to d'arcy :P	2021-03-27 00:41:09 +01:00
zelophed	56b1170224	Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev ... # Conflicts: # src/main/java/com/simibubi/create/foundation/ponder/content/PonderTagScreen.java	2021-03-26 23:59:19 +01:00
zelophed	687743d18f	ponder polish ... - some more changes to z-levels in ponder screens - should be equal to 1.15 ponder now, except for the particles	2021-03-26 23:57:53 +01:00
grimmauld	24c306df90	Merge branch 'mc1.15/dev' into mc1.16/dev	2021-03-26 23:26:22 +01:00
JozsefA	e91a15cf5f	Ejectors wind up again.	2021-03-26 15:25:42 -07:00
grimmauld	60bc6102e2	Add Create stone to base_stone_overworld block tag (terraforged was complaining)	2021-03-26 23:21:44 +01:00
grimmauld	fe10c258c4	Merge & Port	2021-03-26 23:13:49 +01:00
grimmauld	5a176204a5	Merge & Port	2021-03-26 22:17:23 +01:00
simibubi	cb759e793e	3D Printing is cool again ... - Fixed Schematicannon clearing blocks outside of a Schematics' bounding box - Safety check for onBlockPlacedBy with null player - Deployers with a positioned Schematic as their filter will place blocks accordingly, taking items from the contraption inventory	2021-03-26 22:05:16 +01:00
simibubi	0afb29f9a6	Simulate and Translocate ... - Adjusted Brass Tunnels once again to better deal with non-complete item transferrals - Brass tunnels now always output to their sides first - Thrown chromatic products are now gravity-less - Sneaking on Ejectors bypasses them triggering - Fixed ponder tag item listing - Ejectors now trigger observers - Fixed negative bottom pull distance in chutes - Fixed smart chutes deleting non-stackable items - Fixed chutes not able to output partial stacks - Ejectors can now be paused with redstone - Deferred ejector launches by one tick to 'unground' entities more consistently	2021-03-26 18:41:03 +01:00
grimmauld	f28a3e87f3	No longer keep making new wrappers (but particles still don't work)	2021-03-26 16:50:06 +01:00
grimmauld	1675ee25b4	Fix ponder text being shy and hiding behind other things	2021-03-26 16:27:57 +01:00
grimmauld	35c62360be	Merge & Port	2021-03-26 16:03:09 +01:00
grimmauld	9c8d035694	Dya see the dye?	2021-03-26 13:35:45 +01:00
grimmauld	b582b39ae4	Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev	2021-03-26 09:11:48 +01:00
grimmauld	5fa8a0b808	Revert "Fix leave finding in saws so compatibility with other mods works" ... This is necessary to make the distance gathering work. Sorry me dumb dumb	2021-03-26 09:11:25 +01:00
JozsefA	1d2b51250c	Instanced Ejectors and better hashing for BehaviourTypes.	2021-03-25 21:27:08 -07:00
simibubi	718142e26f	Faith in your Depot ... - Added Weighted Ejectors - Fixed? some tunnel distribution inconsistencies	2021-03-26 00:15:38 +01:00
JozsefA	2e5d7a734f	Fix ConcurrentModificationException preparing frame for rendering.	2021-03-25 15:10:40 -07:00
JozsefA	affb8abfbd	Potentially fix weird crash.	2021-03-25 14:48:42 -07:00
JozsefA	a56514c308	Some housekeeping and documentation.	2021-03-25 14:29:52 -07:00
zelophed	8c79174904	fix pressing recipe inconsistency (closes #1296)	2021-03-25 03:58:24 +01:00
zelophed	e26191aaf7	GuiGameReposition ... - adjust the position of the item renderer for gui elements - include a warning when joining a world while fabulous graphics are enabled	2021-03-25 02:27:10 +01:00
JozsefA	b18993ed26	Little things. ... - Quark magnets don't crash (already fixed). - Fix quark magnet leaving behind ghost instances. - Fix crash with belt lighting after being placed by contraptions. - Simplify tile add/remove mixins and avoid conflict with Performant. - Avoid FloatBuffer detour when uploading matrix uniforms. - InstancedTileRenderer no longer has to clean up. - Properly let go of tickable instances.	2021-03-24 15:48:15 -07:00
grimmauld	73f87ab44e	Exotic smoking ... - all blocks tagged as campfires that have the lit blockstate property set to true are now valid smoke sources	2021-03-24 23:42:42 +01:00
grimmauld	bb18d9bf71	runData	2021-03-24 15:11:51 +01:00
grimmauld	4d22b5e9b4	Merge branch 'mc1.15/dev' into mc1.16/dev	2021-03-24 15:07:51 +01:00
grimmauld	7eafbe5757	Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev	2021-03-24 15:07:04 +01:00
grimmauld	16586747a6	Increase priority, less crashing with performant	2021-03-24 15:06:54 +01:00
grimmauld	cbbf502003	port recent changes	2021-03-24 14:54:24 +01:00
JozsefA	1233ecfe80	Fix belt lighting issues, again.	2021-03-23 14:13:32 -07:00
JozsefA	5eae3a53fc	Keeps getting hotter. ... - Belts now use the new system. - Remove ILightListener.java. - Listeners can choose to remove themselves. - Rename some static GridAlignedBB methods.	2021-03-23 02:12:09 -07:00
JozsefA	20189a86fc	Spicy light update listening api. ... - Round 1, no profiling done yet, not everything uses it. - WeakHashSet could be useful elsewhere, too.	2021-03-23 00:08:31 -07:00
JozsefA	1310b88828	Lieutenant Scatterbrain II. ... - Swich to tabs. (not everything is tabs yet) - Refactor light and color attributes to their own Enum. - Quaternion/pivot/position attribute shader. - Always update an instance when the WorldRenderer checks if it should rerender a block. - Simplify some names. - Remove generics in InstanceData classes. - Deployer Tiles now use the oriented material. - Press heads now correctly orient themselves. - ModelData buffers things faster and is simpler.	2021-03-22 20:20:52 -07:00
simibubi	f7f7b67a7d	Thinking Arms ... - Ponder Scenes for the Mechanical Arm - Fixed empty basins showing a fluid container tooltip	2021-03-22 02:05:47 +01:00
simibubi	140cd9a85a	Sailing craft ... - Front face of crafters now supports hoppers and co - Scenes for Sails and Mechanical Crafters - Fixed a couple strange quirks of Ponder text windows	2021-03-21 17:38:33 +01:00
grimmauld	c75a0f8aa7	Particular immersion	2021-03-21 17:16:17 +01:00
JozsefA	9a493b7977	Sticker fixer.	2021-03-20 23:35:13 -07:00
JozsefA	6a0ad77fe7	Refactor away TileEntityInstance#init ... - Move it to the constructor. - An instance is now discarded and recreated if TileEntityInstance#shouldReset return true. - Mark a bunch of stuff final.	2021-03-20 22:33:24 -07:00
simibubi	a356f8a91a	Ponder and Polish ... - Ponder scenes for depot, chute and smart chute - Fixed saws and drains ejecting items when mounted funnel is backstuffed - Fixed extracting funnels allowing items to be inserted by arms and belt input - Vanilla items in ponder tags are marked purple instead of red - Vertical funnels now block chutes - Large cogs can no longer be placed right next to crafters or millstones - Mechanical Arms now stall targeted belt items	2021-03-21 03:51:22 +01:00
JozsefA	f6cfd377a7	Ticking things. ... - Differentiate tickable and dynamic instances. - Instanced repeaters.	2021-03-20 16:30:09 -07:00
grimmauld	9df9a99185	We have SPONGE! ... (and not only for mixins...)	2021-03-20 22:49:42 +01:00
JozsefA	3d0898c59b	Smooth harvesters, step sounds v1.	2021-03-20 13:16:20 -07:00
grimmauld	7199068189	Fix some stuff, break othter stuff ... - Ponder Scenes have misplaced icons - placement helper arrows don't render - Particles in ponders *should* work -> added WrappedClientWorld to make that work - fixed ponder crashingon 1.16 - moved gui stuff to matrix stacks - remove BlockHalper#hasBlockStateProperty, as BlockState#contains is a thing - ran runData	2021-03-20 17:33:35 +01:00
zelophed	d03ea3488a	Merge branch 'mc1.15/dev' into mc1.16/dev ... # Conflicts: # src/generated/resources/.cache/cache # src/generated/resources/assets/create/blockstates/andesite_funnel.json # src/generated/resources/assets/create/blockstates/brass_funnel.json # src/generated/resources/assets/create/lang/unfinished/de_de.json # src/generated/resources/assets/create/lang/unfinished/es_es.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/main/java/com/simibubi/create/AllBlocks.java # src/main/java/com/simibubi/create/compat/jei/category/CreateRecipeCategory.java # src/main/java/com/simibubi/create/content/contraptions/components/actors/ContraptionActorData.java # src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterRenderer.java # src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterTileEntity.java # src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerRenderer.java # src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/AbstractContraptionEntity.java # src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/AssemblyException.java # src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java # src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/IDisplayAssemblyExceptions.java # src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/MovementBehaviour.java # src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/OrientedContraptionEntity.java # src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/LinearChassisBlock.java # src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/gantry/GantryCarriageBlock.java # src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/CartAssemblerBlock.java # src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionRenderDispatcher.java # src/main/java/com/simibubi/create/content/contraptions/fluids/actors/SpoutTileEntity.java # src/main/java/com/simibubi/create/content/contraptions/fluids/tank/FluidTankTileEntity.java # src/main/java/com/simibubi/create/content/contraptions/goggles/IHaveGoggleInformation.java # src/main/java/com/simibubi/create/content/contraptions/particle/RotationIndicatorParticle.java # src/main/java/com/simibubi/create/content/contraptions/relays/belt/transport/BeltMovementHandler.java # src/main/java/com/simibubi/create/content/curiosities/tools/ExtendoGripItem.java # src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelFilterSlotPositioning.java # src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelMovementBehaviour.java # src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelTileEntity.java # src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmInteractionPoint.java # src/main/java/com/simibubi/create/content/logistics/item/filter/AbstractFilterScreen.java # src/main/java/com/simibubi/create/content/logistics/item/filter/AttributeFilterScreen.java # src/main/java/com/simibubi/create/content/schematics/SchematicWorld.java # src/main/java/com/simibubi/create/content/schematics/block/SchematicTableScreen.java # src/main/java/com/simibubi/create/content/schematics/block/SchematicannonRenderer.java # src/main/java/com/simibubi/create/events/ClientEvents.java # src/main/java/com/simibubi/create/foundation/block/connected/ConnectedTextureBehaviour.java # src/main/java/com/simibubi/create/foundation/collision/CollisionDebugger.java # src/main/java/com/simibubi/create/foundation/collision/OBBCollider.java # src/main/java/com/simibubi/create/foundation/data/BuilderTransformers.java # src/main/java/com/simibubi/create/foundation/gui/AbstractSimiContainerScreen.java # src/main/java/com/simibubi/create/foundation/gui/AbstractSimiScreen.java # src/main/java/com/simibubi/create/foundation/gui/AllGuiTextures.java # src/main/java/com/simibubi/create/foundation/gui/AllIcons.java # src/main/java/com/simibubi/create/foundation/gui/widgets/SelectionScrollInput.java # src/main/java/com/simibubi/create/foundation/item/TooltipHelper.java # src/main/java/com/simibubi/create/foundation/mixin/LightUpdateMixin.java # src/main/java/com/simibubi/create/foundation/mixin/RenderHooksMixin.java # src/main/java/com/simibubi/create/foundation/render/KineticRenderer.java # src/main/java/com/simibubi/create/foundation/render/SuperByteBuffer.java # src/main/java/com/simibubi/create/foundation/render/backend/Backend.java # src/main/java/com/simibubi/create/foundation/render/backend/instancing/InstancedTileRenderer.java # src/main/java/com/simibubi/create/foundation/utility/BlockHelper.java # src/main/java/com/simibubi/create/foundation/utility/ColorHelper.java # src/main/java/com/simibubi/create/foundation/utility/Lang.java # src/main/java/com/simibubi/create/foundation/utility/MatrixStacker.java # src/main/java/com/simibubi/create/foundation/utility/TreeCutter.java # src/main/java/com/simibubi/create/foundation/utility/VecHelper.java # src/main/java/com/simibubi/create/foundation/utility/placement/IPlacementHelper.java # src/main/java/com/simibubi/create/foundation/utility/placement/util/PoleHelper.java	2021-03-20 12:58:02 +01:00
simibubi	c0de8c4eb6	The grind continues ... - Scenes for Millstone, Crushing wheels, blaze burners, basin, mixer, press, speedometer and stressometer	2021-03-19 20:05:55 +01:00
JozsefA	cef93ab0a8	Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/dev	2021-03-18 14:37:03 -07:00
JozsefA	b7ec884b9c	Includes, quaternions, and frames. ... - Shaders can now reference other files with #flwinclude <"...">. - Shaders are now located in assets/flywheel/shaders. - Include paths are namespaced (a la ResourceLocation) and relative to the flywheel shaders root folder. - Optimized glsl rotations using quaternions (when applicable) and vectorized matrix construction. - Vectorize diffuse lighting calculations. - Micro optimization in SmartTileEntity.java	2021-03-18 14:36:37 -07:00
Snownee	7954aed0fd	Disassemble contraption when bearing block being rotated by wrench	2021-03-18 23:26:15 +08:00
Snownee	3b36526443	Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev	2021-03-18 18:49:43 +08:00
Snownee	d75793d036	Add extra item capability checks ... Many mods does not invalidate their capabilities, so fix it on our end	2021-03-18 18:43:25 +08:00
simibubi	f7f51d1988	Ponder on Tracks ... - Ponder scenes for the Cart Assembler	2021-03-17 23:31:30 +01:00
simibubi	cddc4a40f5	Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev	2021-03-17 01:23:18 +01:00
simibubi	1d3e057dda	Last kinetic relays and generators ... - Fixed transparency depth sorting inside ponder UI - Scenes for Seq. Gearshift, Furnace Engine/Flywheel and Rotation Speed Controllers	2021-03-17 01:23:16 +01:00
JozsefA	20da7c7761	Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/dev	2021-03-16 15:52:45 -07:00
JozsefA	018c177f1e	Better contraption actor instancing. ... - Promoted actor instance creation to the ActorInstance class. - Drills and Harvesters' rotational speed is based on their movement speed with Flywheel on. - Deployers now use Flywheel.	2021-03-16 15:52:37 -07:00
simibubi	a897b5e78b	Scene machine ... - Fix funnels not rendering filter slot items - Ponder scenes for the Deployer, Harvester and Plough - Fixed uvs on Deployer model - Ploughs can now harvest snow layers	2021-03-16 21:04:42 +01:00
zelophed	13a4d0ca62	funnel extraction ... - allow funnels to extract items when part of a contraption - also include a little animation for the new backtrack button	2021-03-16 17:21:32 +01:00
Snownee	e3394a8907	Allow attribute filter screen to have space to show JEI bookmarks	2021-03-16 21:56:04 +08:00
Snownee	ddb5aa9a3d	Human friendly schematic selection	2021-03-16 15:38:20 +08:00
Snownee	8b5d5abc06	Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/dev	2021-03-16 12:32:31 +08:00
simibubi	27eaf55b45	Another UI reshuffle ... - 'Backstepping' is now a button - Added little labels for hovered buttons at the bottom - Moved ponder/transition-specific logic out of the generic screen class	2021-03-16 03:24:34 +01:00
JozsefA	9a545a09a4	Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/dev	2021-03-15 15:58:51 -07:00
JozsefA	e1c16d869d	Some semblance of immersive portals compat. ... - Each world gets its own KineticRenderer now.	2021-03-15 15:58:41 -07:00
simibubi	e38d85a633	Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev	2021-03-15 23:20:26 +01:00
simibubi	d9027c1d99	Logic Thinking ... - Ponder scenes for various redstone components	2021-03-15 23:20:24 +01:00
JozsefA	52eed2bab3	Instanced Gauges and Valves, DRY lighting.	2021-03-15 14:20:13 -07:00
Snownee	a534d2230c	Implement extra area for schematic table	2021-03-16 00:28:45 +08:00
Snownee	8281c5746a	Fix ponder particles weirdness	2021-03-15 17:00:42 +08:00
Snownee	411925033e	Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/dev	2021-03-15 13:02:05 +08:00
Snownee	0ca388141c	Better line breaking	2021-03-15 13:00:55 +08:00
simibubi	f1b940ea18	Cutting imaginary trees ... - Fixed TEs not ticking properly when wrap-around-skipping to a keyframe - Added a block restoration instruction - Scenes for the Saw - runData catching up	2021-03-15 05:49:29 +01:00
simibubi	2bf9672d92	hotfix ... - Oops. That didn't compile	2021-03-14 23:26:05 +01:00
simibubi	dac1cf0303	Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev	2021-03-14 21:12:04 +01:00
simibubi	a8dc4f3622	Broken Breaking ... - Painful implementation of virtual block breaking overlay - Scenes for the Mechanical Drill	2021-03-14 21:12:02 +01:00
JozsefA	b71c831a07	Lieutenant Scatterbrain. ... - User no longer has to manually add instances, new hook instead. - Use registrate for InstanceFactories. - Instanced levers. - Instanced hand cranks. - Reorganize PhysicalFloat and LerpedFloat.	2021-03-13 20:45:24 -08:00
simibubi	a40d0f58c2	Pondering about sticky stuff ... - Scenes for chassis, super glue, stickers and redstone contact - Added a warning when players try to use experimental rendering while shaders are active	2021-03-13 18:24:10 +01:00
JozsefA	d735d237ec	Ghost blocks are less spooky.	2021-03-12 20:20:14 -08:00
JozsefA	a1e10a5c3c	Belt speed = item speed and secret wrench fix.	2021-03-12 16:33:01 -08:00
JozsefA	f14661fb6f	Pondering: the beginning and the end. ... - Special-case seeking to the end of a ponder scene. - Draw indicators for seeking to the beginning and end. - Fix pulleys not rendering correctly.	2021-03-12 14:03:21 -08:00
simibubi	841bba04bd	Pondering too quickly ... - Fixed idle instruction only idling for t-1 - Made keyframe skipping a little easier - Added option to register keyframes as part of a text window builder - PonderUI now stalls the scene briefly after skips	2021-03-12 20:42:37 +01:00
simibubi	678ddfa764	Spoutput blockage ... - Fixed basin auto-output not working on stopped belts - Basin auto-output can now share a space with funnels - Linear chassis no longer allow sticky sides facing a directly attached linear chassis of the same type	2021-03-12 18:44:05 +01:00
Snownee	af9ed3e44b	Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev	2021-03-12 23:51:20 +08:00
Snownee	6baa519973	Fix cart assembler duplication (closes #1058, #1150)	2021-03-12 23:46:26 +08:00
zelophed	438ac99b2d	fix dist issues for dedicated server	2021-03-12 15:51:25 +01:00
zelophed	51c919e4d8	too much assist ... - add a configurable range to placement helpers i.e. the pole helper specifically	2021-03-12 03:47:36 +01:00
JozsefA	154000290e	Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/dev ... # Conflicts: # src/main/java/com/simibubi/create/foundation/ponder/PonderScene.java # src/main/java/com/simibubi/create/foundation/ponder/PonderUI.java	2021-03-11 16:34:46 -08:00
JozsefA	f9eb4dd2e7	Pondering back and forth. ... - Only about gantries so far. - Reduce Backend log spam.	2021-03-11 15:59:26 -08:00
Kryppers	5e5289fcb0	Update secondary_linear_chassis_side_connected.png	2021-03-11 23:50:58 +00:00
grimmauld	f115233197	Fix leave finding in saws so compatibility with other mods works	2021-03-11 20:31:23 +01:00
simibubi	2a8c3debeb	Captain Distracto, Part II ... - Linear Chassis now connect to each other in any direction	2021-03-11 19:51:58 +01:00
grimmauld	d38f49fab6	Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev	2021-03-11 18:39:22 +01:00
grimmauld	59303fea2f	Extend /create ponder command functionality	2021-03-11 18:39:12 +01:00
zelophed	0448d3f6f3	Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev	2021-03-11 15:29:40 +01:00
zelophed	60dbb931c1	double stick ... - prevent super glue from being placed on already sticky faces	2021-03-11 15:27:17 +01:00
simibubi	4445872959	Stop hacking the base plate size ... - Added proper scene scale/alignment instructions	2021-03-11 13:48:31 +01:00
zelophed	7eb0b95ab9	easier crank interaction ... - allow some blocks to be used while sneaking and holding an item	2021-03-11 12:55:44 +01:00
simibubi	d1e96c3b4b	Timewarp ... - Added user view mode for editors to hide coordinates - Ponder now pauses the game in SP - Ponder elements now use a separate timer and separate partial ticks - Fixed virtual funnels not flapping - Fixed ponder buttons having hover highlights when not clickable - Fixed ponder button mouse hitbox - Addressed strange render state bleed with identify mode highlighting	2021-03-11 11:35:34 +01:00
JozsefA	ea90196250	Clocks are lit. ... - ClockworkContraptions and BearingContraptions now both use the same lighter type.	2021-03-11 01:17:01 -08:00
simibubi	c73e3166cb	Contraption Ponder Push ... - Scenes for Pulley, Piston, and Clockwork Bearing	2021-03-11 03:32:18 +01:00
JozsefA	c54d80a161	Better bounding boxes for bearings. ... - Fix bug causing entities to slip off the far corners of bearing contraptions. - This was already implemented for BearingLighter.java, now it's promoted to Contraption.java. - Promote anonymous WrappedWorld in Contraption.java to inner class.	2021-03-10 17:08:20 -08:00
JozsefA	b7f0fe9b10	Oops engine stuff is okay again.	2021-03-10 16:09:17 -08:00
JozsefA	d0a6f4123b	Instanced flywheels, engines, and schematicannons.	2021-03-10 13:44:04 -08:00
simibubi	d8ab00b66e	Pondering about Mechanical Bearings	2021-03-10 19:18:25 +01:00
JozsefA	2ddf57cd76	Instanced mixers and presses.	2021-03-09 15:46:15 -08:00
JozsefA	dcea504184	Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/dev	2021-03-09 14:23:40 -08:00
JozsefA	95eabe9cf9	Instanced arms.	2021-03-09 14:22:20 -08:00
simibubi	cb063d161c	Pondering about Windmills	2021-03-09 21:17:02 +01:00
simibubi	6b999fa7d4	Tag hopping ... - Ponder UIs opened from a tag screen now skip to the first scene with a matching tag if available	2021-03-09 17:32:01 +01:00
simibubi	d252a204ef	Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev	2021-03-09 04:24:48 +01:00
simibubi	d61b840c5c	Back to fighting Minecarts ... - Fixed Minecart Contraptions started on a powered rail facing in unwanted directions - Fixed powered rail Cart Assemblers not respecting the solid block rule of powered rails - Fixed Minecart contraption items not facing away from the player when placed - Polished every last bit of the belt uvs	2021-03-09 04:24:45 +01:00
zelophed	a91360a7b9	changing format ... - goggle overlays now use a localized number format - minor changes to the layout of the ponder index screen	2021-03-09 03:45:05 +01:00
simibubi	62c3ae4040	Captain Distracto ... - Removed processing recipes from recipe book - Reorganized items in creative tab - Tweaked a few model transforms - Fixed belt uvs - ponder birbs can now face the cursor - fix interpolation on ponder birbs - Fixed log spam when assembling certain blocks (Points of interest) in a contraption - Fixed content observers not triggering for in-line belt funnels	2021-03-09 01:49:49 +01:00
JozsefA	33d718d653	Check if worlds support the flywheel backend.	2021-03-08 15:24:58 -08:00
JozsefA	2b37842259	Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/dev	2021-03-08 14:04:25 -08:00
simibubi	6c8fe67fd4	Gradle Mondays ... - Replaced ponderworld particle AT with reflection - Symmetry Wand now checks for placement permissions - Lang now uses Locale.ROOT - Fixed crash using ponder without advanced tooltips enabled	2021-03-08 22:12:25 +01:00
JozsefA	e943705fb7	Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/dev ... # Conflicts: # src/main/java/com/simibubi/create/AllTileEntities.java # src/main/resources/META-INF/accesstransformer.cfg	2021-03-08 11:06:35 -08:00
simibubi	bea60ccb86	Fix build issues	2021-03-08 17:42:50 +01:00
simibubi	21d87a0cfe	Change mixin repo	2021-03-08 17:29:42 +01:00
simibubi	1a315a11cf	Merge branch 'mc1.15/ponder-ui' into mc1.15/dev	2021-03-08 17:29:06 +01:00
JozsefA	b31f4d09bd	Housekeeping.	2021-03-08 02:27:56 -08:00
JozsefA	8ce0f47f01	No more 7 circles of callbacks. ... - Instead of using consumers to edit instance data, just give the user a pointer to the data. - Easier to use, more predictable access.	2021-03-08 02:02:47 -08:00
JozsefA	d0e5be24d7	Transformed models.	2021-03-08 00:36:23 -08:00
simibubi	ca2cf94579	Scene hacking getting out of control ... - New highly over-engineered scenes for Encased Fans - Potential Fix for GL errors with the framebuffer system	2021-03-08 02:59:43 +01:00
simibubi	15e88b9bcf	Belts ... - Ponder scenes for the belt	2021-03-07 21:52:11 +01:00
simibubi	47b54b1ae6	Ponder me this ... - auto-backtracking is now more generic and works for tag screens - Ponder entries for water wheel, motor, hand crank and valves	2021-03-07 17:22:18 +01:00
JozsefA	bb3fed2a3b	Towards better normals. ... - Easier SuperByteBuffer transform settings. - Some cleanup here and there.	2021-03-06 21:46:17 -08:00
JozsefA	e930e62436	Belting these bugs. ... - Belts now always render their items again. - Items on belts on contraptions are now at least somewhat lit.	2021-03-06 15:08:46 -08:00
JozsefA	25b4e4d5be	The bell tolls for this bug. ... - Fix MovementBehavior#onSpeedChanged not ever being called.	2021-03-06 14:33:01 -08:00
simibubi	3bc2a9e30f	Sanity for translators ... - Generated lang entries of re-used scenes now refer to the same set of keys - Scenes for Chain Drive and Chain Gearshift	2021-03-06 18:08:03 +01:00
simibubi	aa0a58b0da	Tooltips except it takes one hour per block ... - Added and assigned more ponder tags - Ponder Scenes for cog, large cog, gearbox, clutch, gearshift, and casings - Fixed TE model data not queried on schematics and ponder scenes	2021-03-06 04:06:49 +01:00
simibubi	83a641c3b8	go teach them ... - Ponder scenes for portable storage interface - More work on tags - Fixed tag screen on small resolution	2021-03-05 20:54:41 +01:00
JozsefA	25fdf08e11	Fog modes for new rendering. ... - For each fog mode, compile a different version of each shader. - Could maybe do some fancier preprocessing to make writing shaders easier?	2021-03-04 23:43:28 -08:00
simibubi	e2c50663a5	UI and tag enhancements ... - Fixed partial ticks on transitions - Transitions center on clicked components - Added auto-lang for tags - Moved some other ui stuff around	2021-03-05 01:36:41 +01:00
MRH0	40fef0eaf9	Update KineticTileEntity.java	2021-03-05 00:50:51 +01:00
JozsefA	b511a20814	Flappy packets. ... - Instead of sending the entire tile entity (and maybe even chunk), send just what we need to. - Avoids unnecessary chunk rebuilds when flaps flap. - Beginning of a larger process to replace calls to SyncedTileEntity#sendData	2021-03-04 15:34:17 -08:00
zelophed	d590b23aa7	tagging along ... - added tags and chapters to the ponder registry - slightly changed how scenes are registered - added a back stack to the screen opener and some animations to go along with it - added a interface for icons drawn into screens	2021-03-04 12:58:26 +01:00
JozsefA	9062f1c8fa	Null checks and flap updates.	2021-03-03 17:15:45 -08:00
JozsefA	fe492c5d75	Better instance deletions. ... - Defer element removal until just before the model is drawn. - Use a modified version of ArrayList#removeIf to delete the instances and adjust the keys.	2021-03-03 17:14:19 -08:00
JozsefA	9d77f85b94	Fix crash on world reload.	2021-03-03 13:10:44 -08:00
grimmauld	93973004c8	Seats don't Like deployers. They just don't.	2021-03-03 19:33:15 +01:00
simibubi	8bf82aff79	Refactor Goggles Fluid Information ... - Removed code duplicates - Made fluid information more generic and concise - Made fluid information easier to port - Fixed potion fluid not overriding its translation key - (I'm sorry, Steven)	2021-03-03 19:17:56 +01:00
simibubi	31cb704894	Refactor comparator overrides ... - Removed unnecessary level tracking - Remove code duplicates - Fixed smart fluid tank behaviours not triggering markDirty on deferred fluid update	2021-03-03 17:59:27 +01:00
simibubi	5567e57265	Post-PR datagen	2021-03-03 16:34:10 +01:00
simibubi	562104341d	Merge branch 'mc1.15/dev' into comparator-tanks	2021-03-03 16:30:59 +01:00
simibubi	325ca68917	Merge pull request #1138 from SuicidalSteve/mc1.15/dev ... [Bugfix] Make omnidirectional entity crushing more consistent.	2021-03-03 16:23:46 +01:00
simibubi	2b1c17cb48	Merge pull request #1133 from FrannDzs/patch-2 ... Update es_es.json (HOTFIX)	2021-03-03 16:23:01 +01:00
simibubi	20d8e1d915	Merge pull request #1130 from Alepod/patch-2 ... Update ru_ru.json	2021-03-03 16:22:02 +01:00
simibubi	fe6d9136fc	Merge pull request #1129 from Alepod/patch-1 ... Update ru_ru.json	2021-03-03 16:21:27 +01:00
JozsefA	b1dc36d358	Trying to tick everything is slow. ... - Keep track of tickable instances separately.	2021-03-03 02:37:04 -08:00
simibubi	c1c6e5e046	Controlled attachment ... - Added the Sticker, a redstone-driven block attachment component - Fixed lighting of TileEntities lowered by a pulley	2021-03-03 05:21:58 +01:00
simibubi	5949dd376b	Fixed honey bottles on belt/depots	2021-03-03 02:34:57 +01:00
simibubi	e87849deca	Vector's food expansion ... - Added honeyed apples - Added sweet rolls - Added chocolate glazed berries - New goggles item model - Other texture tweaks	2021-03-03 02:30:21 +01:00
JozsefA	5499fdbad0	The flappening. ... Tunnel and funnel flaps are now rendered with the new engine.	2021-03-02 15:54:31 -08:00
simibubi	2e1129a3a5	Thinking about Gantries ... - Added Ponder entries for gantry shafts and carriages - Added ability to mark lang key prefixes as ignored, leaving out 'dev-only' lang entries from the localization templates - Gantry Pinion -> Gantry Carriage - Scenes can now be "re-assembled" by their storyboard while Ponder is opened using shift+refresh - removed the requirement of editor provided lang keys for text windows - couple fixes, changes to instructions	2021-03-02 05:53:43 +01:00
grimmauld	1e28bc998a	Make contraptions not take that stupid amount of cpu time when in water	2021-03-01 10:37:49 +01:00
simibubi	0a1be94cbb	Funnel Fantasy VII ... - Finished ponder entries about funnels - Smart TEs can now enter "virtual mode" to run both client and server code (support for it needs individual adjustment) - Removed obsolete quads from the andesite funnels' model - Not enough ponder instructions - Fixed upright belt items in ponder UI	2021-02-28 23:49:51 +01:00
JozsefA	55f1b538b5	Only contraptions use EBOs now. ... Tight light bounds for bearing contraptions.	2021-02-27 21:35:45 -08:00
JozsefA	884f19d518	Fix issue when rendering very large contraptions.	2021-02-27 18:29:35 -08:00
JozsefA	3a2771c5c0	Fix issue restricting the maximum size of contraptions.	2021-02-27 18:24:48 -08:00
simibubi	43f0ad1c78	Freeze and Identify ... - Ponder scenes can now be paused and analysed, viewing tooltips for targeted blocks in the scene - During editing, identify mode can be used to move targeted positions to the clipboard - Ponder-compatible components can be pondered about in identify mode	2021-02-28 01:34:56 +01:00
_0Steven	23d7d65bb2	...Right, language datagen is a thing ... - Actually put the lang stuff in the right files, and generate the other localization files...	2021-02-27 17:24:49 +01:00
_0Steven	8e5b5582f3	Fluid Overlays and Comparator Compat ... -Add comparator compat to fluid tanks, spouts, and item drains. -Add goggle overlays to fluid tanks, spouts, item drains, and basins. -Update goggle item tooltip slightly.	2021-02-27 17:08:35 +01:00
simibubi	692c6deaaf	More pondering ... - First couple of funnel scenes - More utility methods - Scene progress bar - An inspect mode that does nothing	2021-02-26 19:46:56 +01:00
JozsefA	6dc4a18ed3	Extra safety checks.	2021-02-25 17:16:22 -08:00
zelophed	e1644c11e2	Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev	2021-02-25 19:03:23 +01:00
zelophed	46bbdc70c9	small command adjustments	2021-02-25 19:03:07 +01:00
JozsefA	c030c08c86	Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/dev	2021-02-24 16:53:45 -08:00
JozsefA	e62d89b21c	Everything is lit, hopefully all the time now.	2021-02-24 16:52:49 -08:00
zelophed	753d5d2fa9	Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev	2021-02-24 22:06:51 +01:00
zelophed	2f12326203	cloning glue	2021-02-24 22:06:40 +01:00
simibubi	550744da92	Merge branch 'mc1.15/dev' into mc1.15/ponder-ui	2021-02-24 17:52:20 +01:00
simibubi	051a32557f	Desperate Control ... - Belt items and item entities now support element links (albeit in a slightly limited fashion)	2021-02-24 17:48:45 +01:00
JozsefA	cad71e5843	Even more compatibility.	2021-02-23 16:20:46 -08:00
JozsefA	f525b7e913	Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/dev	2021-02-22 11:27:12 -08:00
JozsefA	bac4be1728	Superglue no longer gums up spawn packets	2021-02-22 11:25:38 -08:00
_0Steven	8eb287f844	...Update imports ... - Remove a singular now unused import from WaterWheelBlock.java cause I apparently just forgot to do so.	2021-02-22 13:44:09 +01:00
_0Steven	33a08a235e	Turbines- I mean horizontal water wheels ... - Make water wheels work and be able to be placed horizontally	2021-02-22 13:09:50 +01:00
RakuGaki-MC	6a5d0a00c7	fix ... fix ちょっと修正	2021-02-22 17:47:52 +09:00
RakuGaki-MC	4dc0b107e6	Update ja_jp.json ... [mc1.16/dev] update & fix	2021-02-22 17:16:24 +09:00
Franco Paladini	d8beae6ee9	Update es_es.json	2021-02-22 03:12:41 -03:00
Franco Paladini	38d406e85d	Update es_es.json ... Updated	2021-02-22 03:07:02 -03:00
zelophed	da09112e3c	Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev	2021-02-22 03:20:54 +01:00
zelophed	5da1a64622	utility commands	2021-02-22 03:20:09 +01:00
simibubi	fe1c32de05	Cheese control ... - Windmill bearings now have a configurable minimum of sail blocks	2021-02-21 23:01:57 +01:00
simibubi	e3915792b1	Back to Directional ... - New vertical funnel models by @Kryppers	2021-02-21 22:29:46 +01:00
simibubi	9d4e52092e	Basic item simulation ... - Support for generic entities inside ponder scenes - Instructions for manipulating/creating entities - Client-side belts are now slightly smarter inside a ponder world - Some doc for the doc	2021-02-21 19:29:23 +01:00
zelophed	46daa3f699	composting, but fancy ... - add the composter as a mechanical arm interaction point	2021-02-21 18:12:19 +01:00
simibubi	c4e1f680c9	Such convenience ... - Organized util and scene builder methods into nested classes - Selection rework, allows for addition and substraction - World sections now merge into a global world section after fading in - Support for managing reference to elements created by previous instructions - more util - Support for animating world sections to roughly simulate a contraption - Less paperwork for making new scenes - Support for outliner chaseAABB - Support for outlining selections	2021-02-21 03:18:04 +01:00
JozsefA	b5f9cbc4b3	improve compatibility layer.	2021-02-20 15:22:07 -08:00
_0Steven	41cb2ad937	Stop explody crusher drops ... - Remove the velocity of item entities dropped by crushed mobs so they fall neatly onto belts rather than exploding everywhere.	2021-02-20 18:50:40 +01:00
grimmauld	77d5c00949	merge cleanup	2021-02-20 18:00:16 +01:00
grimmauld	f6b9d71169	Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev	2021-02-20 17:58:25 +01:00
grimmauld	6542f2f087	Some cleanup	2021-02-20 17:58:16 +01:00
grimmauld	31e3c5b0bd	Port recent changes	2021-02-20 17:27:51 +01:00
_0Steven	a32cbe15a3	Consistently Crushing Entities ... - Fix known issue with omnidirectional crushing wheels inconsistently moving crushed mob drops to the output location.	2021-02-20 15:08:58 +01:00
JozsefA	e84c6d3abe	tweak max origin distance to avoid z-fighting at relatively high coordinates. ... remove unnecessary state changes.	2021-02-19 15:00:28 -08:00
Franco Paladini	ffc152ecf2	Update es_es.json (HOTFIX) ... -Translated unfinished strings -Some improvements and fixes	2021-02-19 17:16:28 -03:00
simibubi	45fc0ca7ee	post-merge fixup	2021-02-19 20:21:29 +01:00
simibubi	b61dc0d562	Merge branch 'mc1.15/dev' into mc1.15/ponder-ui	2021-02-19 18:03:34 +01:00
simibubi	afe2c4497d	Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev	2021-02-19 16:59:59 +01:00
simibubi	bfd666bb9c	Sequenced Adjustments ... - Added more descriptive names for sequencer instructions - 'Await' instruction now requires a rising flank to trigger - Fixed invalid json of german localization - Ingored crushing wheel controllers facing in blockstate datagen	2021-02-19 16:55:45 +01:00
grimmauld	a3f2fbe788	Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev	2021-02-19 16:39:11 +01:00
grimmauld	5b65a5d78b	better fan stream advancement trigger	2021-02-19 16:39:01 +01:00
Alepod	619045a505	Update ru_ru.json ... More mistakes fixed	2021-02-19 16:44:49 +02:00
Alepod	5a1984eae4	Update ru_ru.json ... Minor typo fixed	2021-02-19 16:42:25 +02:00
simibubi	2ece21a3ec	Merge pull request #962 from CookieNick/mc1.15/paused-sequenced-gearshift ... Added the 'Paused' instruction for sequenced gearshift	2021-02-19 15:10:14 +01:00
grimmauld	d0357df863	Move stuff of RegistryTrigger over to StringSerializableTrigger to make future expansion possible	2021-02-19 15:08:50 +01:00
simibubi	f363d56cc1	Merge pull request #1115 from FrannDzs/mc1.15/dev ... Added Spanish language (es_es) [FINISHED]	2021-02-19 15:05:37 +01:00
simibubi	e424245d3a	Merge pull request #1083 from muffinbarde/mc1.15/dev ... Update de_de.json 1.15/dev	2021-02-19 15:03:25 +01:00
simibubi	13e8f67d05	Merge pull request #900 from SuicidalSteve/mc1.15/dev ... Omnidirectional Crushing Wheels	2021-02-19 15:01:19 +01:00
grimmauld	589572df6c	kill kinetic block trigger, clean up unused stuff	2021-02-19 14:49:22 +01:00
simibubi	37434f3933	Merge pull request #1045 from TheBv/mc1.15/dev ... Fixed issues with the blockzapper and FTBChunks	2021-02-19 14:46:48 +01:00
simibubi	fd65acd91d	Merge pull request #1062 from Snownee/mc1.15/dev ... Bug fixes	2021-02-19 14:22:37 +01:00
grimmauld	667c213506	remove unused light absorb trigger	2021-02-19 14:13:18 +01:00
grimmauld	3f9ee09953	Rework Bracket trigger to now be a registry trigger based on base block	2021-02-19 14:12:26 +01:00
grimmauld	d9aa912796	generic registry based triggers (replaced kinetic block trigger and infinite fluid trigger)	2021-02-19 09:09:29 +01:00
Franco Paladini	7c0d0b6439	Update es_es.json	2021-02-19 00:53:47 -03:00
Franco Paladini	54ca447301	Update es_es.json	2021-02-19 00:53:29 -03:00
simibubi	355a1dd95d	Port new changes	2021-02-19 00:50:05 +01:00
simibubi	4ee9dd8a8a	Merge branch 'mc1.15/dev' into mc1.16/dev	2021-02-19 00:49:39 +01:00
Kryppers	e2ccb80870	Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev	2021-02-18 22:57:32 +00:00
Kryppers	3c48ece021	It's the Funnel Countdown ... d-do-do dooo, do-de-do-do-doooo	2021-02-18 22:57:25 +00:00
JozsefA	84c9569707	Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/experimental-rendering	2021-02-18 14:10:43 -08:00
JozsefA	3e63afa5f5	fix concurrent modification	2021-02-18 14:00:17 -08:00
grimmauld	7023148e7f	generic infinite fluid triggers	2021-02-18 23:00:17 +01:00
grimmauld	8c8a9abd8a	Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev ... # Conflicts: # src/generated/resources/assets/create/blockstates/fluid_pipe.json	2021-02-18 22:32:45 +01:00
simibubi	d59fea1079	Bloat. ... - Auto-Organize inputs - runData after lang PRs - change runWhenOn to non-deprecated unsafeRunWhenOn, now that late forge version is required - Address a few warnings	2021-02-18 19:43:22 +01:00
Franco Paladini	9c1ab785d7	Update es_es.json	2021-02-18 15:00:07 -03:00
simibubi	c0b6a55209	Merge pull request #1075 from CKenJa/mc1.15/dev ... Localize Fixes	2021-02-18 18:08:19 +01:00
simibubi	616bc09267	Merge pull request #1040 from Chexet48/patch-2 ... Update it_it.json	2021-02-18 18:07:11 +01:00
simibubi	cf34b2e96b	Fix fast fluid valves ... - Ensure animated indicators on fluid valves still show up with experimental rendering	2021-02-18 18:05:39 +01:00
simibubi	3ff3992f97	Merge pull request #1118 from Jozufozu/mc1.15/experimental-rendering ... Experimental Rendering	2021-02-18 17:59:52 +01:00
Kryppers	779b19b377	Multiple Thread improvements. ... improved the threads.	2021-02-18 16:01:05 +00:00
simibubi	203ca6f849	Birbs and Click input	2021-02-18 15:44:18 +01:00
muriplz	f8d6f73f8a	Update es_es.json	2021-02-18 12:26:59 +01:00
muriplz	a52865666a	Update es_es.json	2021-02-18 12:19:40 +01:00
muriplz	310cbd484c	Update es_es.json	2021-02-18 12:09:09 +01:00
JozsefA	9b4d53d452	fix one residual merge conflict. ... creating matrix stacks is expensive, but correct.	2021-02-17 14:27:49 -08:00
JozsefA	24ab4e181f	Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/experimental-rendering ... # Conflicts: # src/main/java/com/simibubi/create/CreateClient.java # src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java # src/main/java/com/simibubi/create/events/ClientEvents.java # src/main/resources/META-INF/accesstransformer.cfg	2021-02-17 14:06:13 -08:00
JozsefA	02db3f5a2c	fix some problematic code. ... creating matrix stacks is expensive, apparently	2021-02-17 13:58:24 -08:00
Franco Paladini	22c03c4a14	Update es_es.json ... accents suppressed	2021-02-17 16:56:09 -03:00
Franco Paladini	9048442fec	Update es_es.json	2021-02-17 16:52:50 -03:00
Franco Paladini	607ce9edca	Update es_es.json	2021-02-17 16:43:06 -03:00
Franco Paladini	9d57a25104	Update es_es.json	2021-02-17 16:42:37 -03:00
Franco Paladini	bd49e9bc7f	Update es_es.json	2021-02-17 16:39:07 -03:00
Franco Paladini	2f9607a196	Update es_es.json	2021-02-17 16:29:35 -03:00
JozsefA	a5d6262424	fix mechanical crafter cogs	2021-02-17 11:24:40 -08:00
Franco Paladini	d187dc0b38	Update es_es.json	2021-02-17 14:50:28 -03:00
Zelophed	159e298e8b	paletted contraptions ... - use minecraft's palette-map during serialization and deserialization to reduce compound size in most cases - also update the placement_indicator sprite sheet	2021-02-17 17:21:31 +01:00
Franco Paladini	a4c96be51c	Update es_es.json	2021-02-17 08:24:41 -03:00
Franco Paladini	36553c6ee0	Update es_es.json	2021-02-17 01:01:01 -03:00
Franco Paladini	c4c57c6ba1	Update es_es.json	2021-02-16 23:41:47 -03:00
JozsefA	7aa175dd9c	fix gantry cogs skipping every half rotation	2021-02-16 15:13:48 -08:00
Franco Paladini	ed04fd1d52	Update es_es.json	2021-02-16 19:54:49 -03:00
JozsefA	d2e30eeab5	finish merge ... remove old assets	2021-02-16 14:47:03 -08:00
Zelophed	bec13b8e7d	Assisted Placement, Part IV-b	2021-02-16 22:50:11 +01:00
grimmauld	716f79872c	Actually port	2021-02-16 20:52:26 +01:00
grimmauld	c6f82bff5e	Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev	2021-02-16 20:29:40 +01:00
grimmauld	08562d2689	preliminary merge	2021-02-16 20:21:42 +01:00
simibubi	fd99acc00a	Merge branch 'mc1.15/dev' into mc1.15/ponder-ui	2021-02-16 19:36:12 +01:00
simibubi	18067e8d5c	Ponder ... - rebrand - support for particles - support for fluids - support for outliner - coloured text labels - debug scenes - proper UI stuff - proper layered rendering	2021-02-16 19:35:26 +01:00
Franco Paladini	e4fe371d4c	Add Spanish language (es_es) (unfinished)	2021-02-16 13:59:05 -03:00
JozsefA	15302495f5	Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/experimental-rendering-merge ... # Conflicts: # src/main/java/com/simibubi/create/AllEntityTypes.java # src/main/java/com/simibubi/create/AllSpriteShifts.java # src/main/java/com/simibubi/create/content/contraptions/base/KineticTileEntity.java # src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java # src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/OrientedContraptionEntityRenderer.java # src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/MechanicalBearingTileEntity.java # src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MountedContraption.java # src/main/java/com/simibubi/create/content/contraptions/relays/advanced/SpeedControllerRenderer.java # src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltRenderer.java # src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltTileEntity.java # src/main/java/com/simibubi/create/foundation/command/AllCommands.java # src/main/java/com/simibubi/create/foundation/utility/outliner/Outliner.java	2021-02-15 21:27:08 -08:00
Zelophed	b9d1a586c1	Assisted Placement, Part IV ... - added 👻-blocks as a placement preview	2021-02-16 00:48:13 +01:00
JozsefA	1e95fe4c7b	avoid floating point accuracy errors at high coordinate values. ... refactor contraption model translation to be a method in AbstractContraptionEntity. - this simplifies the setup required for the fast rendering.	2021-02-14 23:09:17 -08:00
Snownee	5e14ca71d9	Add max stack size check to ItemHelper.extract	2021-02-14 11:51:31 +08:00
Snownee	676a05ad07	Fix rose quartz duplication glitch (#1104)	2021-02-14 11:18:38 +08:00
JozsefA	11616a0b16	avoid 'glGet's at all costs	2021-02-13 16:26:34 -08:00
JozsefA	951a0c4769	contraption actors take into account self lighting	2021-02-13 13:10:14 -08:00
JozsefA	0ad6db4bf7	cache KTEs' renderBoundingBox	2021-02-12 23:06:41 -08:00
Snownee	2d2c7e653f	Avoid unnecessary piston contraption assembling	2021-02-13 14:14:28 +08:00
JozsefA	b1905ddfd4	probably fix issue with phosphor crashing contraptions	2021-02-12 21:11:35 -08:00
Snownee	dae651c046	Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev	2021-02-13 13:06:11 +08:00
JozsefA	e88dd89262	whoops null pointer is no more	2021-02-12 19:33:13 -08:00
JozsefA	485a0d2f95	hotswapping is more sane now.	2021-02-12 17:30:21 -08:00
JozsefA	a5f3d799d1	kinda separate system capability stuff, should probably clean this up more. ... fix lighting glitches on world load.	2021-02-12 16:36:20 -08:00
simibubi	8ab27904db	More Instructions	2021-02-12 17:08:48 +01:00
JozsefA	d824304f12	tile entities on contraptions account for self lighting	2021-02-12 00:13:39 -08:00
JozsefA	a8053ce472	these are somewhere else too	2021-02-11 23:41:52 -08:00
JozsefA	31a1fd71ce	everything is somewhere else	2021-02-11 23:36:05 -08:00
JozsefA	67408e0dff	better vertex attributes. ... all shaders are now GL 2.0 compatible!!! contraption structure rendering is technically 2.0 compatible now, need some better handling for that.	2021-02-11 20:03:24 -08:00
Zelophed	34de9a0319	Player Feedback, Part III	2021-02-12 03:13:19 +01:00
JozsefA	576165e3d6	some attrib stuff	2021-02-11 14:31:50 -08:00
Zelophed	82e922032a	Merge branch 'mc1.15/feedback2' into mc1.15/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/components/structureMovement/Contraption.java # src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/BearingContraption.java # src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/ClockworkContraption.java # src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/StabilizedContraption.java # src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MountedContraption.java # src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/PistonContraption.java # src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/PulleyContraption.java	2021-02-11 20:07:38 +01:00
Zelophed	b4c881a6c8	Player Feedback, Part II	2021-02-11 17:47:55 +01:00
muffinbarde	5f6c94939c	Update de_de.json	2021-02-11 17:21:05 +01:00
JozsefA	3820e11954	get it working again	2021-02-11 02:26:30 -08:00
JozsefA	02114b1d9a	begin 2.0 compatibility push, probably not going to be ready for the next release	2021-02-10 17:14:03 -08:00
Zelophed	f3fd32edd3	Assisted Placement, Part III ... - blocks placed by helpers make sounds again - helpers now trigger the proper event and can be cancelled	2021-02-11 00:28:47 +01:00
simibubi	fd3d7bd7fd	Refined animations, key input	2021-02-10 16:40:30 +01:00
JozsefA	e93562569b	world fog works, fluid fog still doesn't. ... better dimension changes.	2021-02-09 21:18:05 -08:00
CKenJa	a8b1fe5f90	Localize Fixes	2021-02-10 13:07:41 +09:00
simibubi	e178cab4a8	Multiple scenes per doc	2021-02-10 03:13:33 +01:00
JozsefA	0cb9094913	non experimental contraption rendering is back. ... schematic rendering is fixed. both of these are kinda ugly hacks, and there is definitely some rewriting necessary for when it's time to be more opengl compatible. maybe fix belt lighting, again. remove old belt assets.	2021-02-09 16:14:44 -08:00
simibubi	6836bd97f4	First Steps	2021-02-09 22:34:14 +01:00
JozsefA	6736577e1b	fix the rainbow debugger	2021-02-08 21:38:45 -08:00
JozsefA	cfff806df4	some micro optimizations. ... cache hot getters. reduce number of calls to getBeltFacing() in BeltRenderer. preserve floating point accuracy over (insanely) long play times. rotate some normals and light some quads.	2021-02-08 21:17:25 -08:00
simibubi	4a5479838c	Merge branch 'mc1.15/dev' into mc1.15/metadoc	2021-02-08 16:51:52 +01:00
Snownee	607dbbfb90	Fix PSI item dupe	2021-02-08 22:40:55 +08:00
JozsefA	ee9962b27b	fix some new rendering issues that popped up after the revert ... proper? optifine shader handling. could use more testing	2021-02-07 22:11:29 -08:00
JozsefA	c9ff31b099	hot swappable rendering ... kind of detects optifine still some kinks to work out	2021-02-07 14:15:52 -08:00
Chexet48	05e62ced51	Update it_it.json	2021-02-07 22:51:43 +01:00
simibubi	dd94cdd3f8	Register world features properlyTM, Part II ... - Re-enabled ability to control create world-gen with a global flag	2021-02-07 21:32:37 +01:00
simibubi	dc13ea6485	Register world features properlyTM ... - Refactored Create's config-driven worldgen to better work with the feature infrastructure of 1.16. Adresses #539	2021-02-07 21:27:55 +01:00
simibubi	cb2c56d772	Gantry shaft placement assist	2021-02-07 18:09:08 +01:00
Snownee	16991c2ce8	Fix NPE while deployer on a contraption trying to disassemble self	2021-02-07 15:49:25 +08:00
s0127943	d8054775d5	Removed unnecessary blocksnapshot.restore	2021-02-07 01:03:53 +01:00
s0127943	f3b6a684f9	Added check to see if a user is allowed to place blocks in the given position to counteract issues with FTBChunks	2021-02-07 01:01:48 +01:00
JozsefA	3e6ef34993	restore arm rendering	2021-02-06 14:39:58 -08:00
simibubi	01a83722cf	Merge pull request #1041 from Creators-of-Create/mc1.16/compat-fix-redux ... Repair renamed recipes	2021-02-06 22:44:03 +01:00
simibubi	9077e99c4f	Restore cache	2021-02-06 22:43:27 +01:00
simibubi	a8d04cc152	Merge branch 'mc1.15/dev' into mc1.16/dev	2021-02-06 22:43:01 +01:00
simibubi	6981848f8a	Clean-up ... - Fixed smart chutes not filtering properly - Fixed chutes not treating smart chutes like chutes - Removed code leftovers - Removed datagen cache from gitignore	2021-02-06 22:41:20 +01:00
simibubi	d7a41b7810	Port new changes ... - Fix incompatible resource pack version	2021-02-06 22:03:48 +01:00
simibubi	2700832dff	Merge branch 'mc1.15/dev' into mc1.16/dev	2021-02-06 21:41:02 +01:00
Nick Smit	44a3313c12	Added the 'Paused' instruction for sequenced gearshift, which waits for another redstone pulse to continue.	2021-02-06 21:07:24 +01:00
Noobulus	2ee71728df	Repair renamed recipes ... Fixes for #987 and parts of #1022 caused by some internal item name changeds between 1.15 to 1.16	2021-02-06 13:26:42 -06:00
Chexet48	83df83d4be	Update it_it.json ... Added Gantry Pinion and Gantry Shaft, missing in unlocalized entries	2021-02-06 19:09:29 +01:00
simibubi	2315625c4b	Quickfix ... - Fixed gantry shafts able to cause loops in kinetic connectivity when switching to powered state	2021-02-06 18:11:35 +01:00
simibubi	88f80c6240	Refresh unfinished/fr_fr template file	2021-02-06 17:48:03 +01:00
Odin	577c0e4912	Update fr_fr.json ... 666 Unlocalized	2021-02-06 17:34:37 +01:00
simibubi	bed5a1d03a	Merge pull request #965 from Snownee/mc1.15/security-patches ... Security patches	2021-02-06 17:20:58 +01:00
simibubi	85110f3ce8	Merge pull request #906 from Snownee/mc1.15/dev ... Bug fixes	2021-02-06 16:23:35 +01:00
simibubi	3d8b10d9a7	Gantry improvements ... - Fixed gantry shafts not locking to correct orientations when placed near others - Gantry pinions can now be kickstarted by player interaction - Gantry pinions now update properly after being moved onto different gantry shafts - Fixed Encased Fans not providing kinetic power after being moved by contraption - Sticky Mechanical Pistons now drag attached structures with them - Mechanical piston heads and poles now drag their entire piston multiblock with them	2021-02-06 16:07:22 +01:00
JozsefA	5ba4477ada	restore old tile rendering from 3336778052	2021-02-06 02:26:56 -08:00
JozsefA	90993ce8e1	start working on schematic rendering	2021-02-05 22:48:55 -08:00
grimmauld	3d2edc492b	Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev	2021-02-05 21:36:10 +01:00
Snownee	25daf28205	Format codes	2021-02-06 04:21:07 +08:00
Snownee	2baa3f9922	Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/security-patches	2021-02-06 04:16:26 +08:00
simibubi	ff96e80d81	ru_ru.json ... - Integrated changes to russian localization made by #819 on correct branch to the correct file	2021-02-05 20:31:49 +01:00
simibubi	b3ee203701	fr_fr.json ... - Reorganize localization file	2021-02-05 20:11:52 +01:00
simibubi	4a357bb729	Merge pull request #1027 from dindin-glitch/patch-2 ... Translated a bunch of random things	2021-02-05 20:05:42 +01:00
simibubi	16e871feba	it_it.json ... - Move lang file to correct location	2021-02-05 20:02:39 +01:00
simibubi	ed84343f38	Merge branch 'mc1.15/dev' into patch-1	2021-02-05 19:59:43 +01:00
simibubi	60c66980c6	datagen pass	2021-02-05 19:55:50 +01:00
simibubi	df6b92cf19	Merge pull request #985 from dunois2737/mc1.15/dev ... Create zh_tw.json	2021-02-05 19:52:19 +01:00
simibubi	58d2171f02	Merge pull request #896 from LWHK/mc1.15/dev ... [Localization]update CHS translation	2021-02-05 19:45:47 +01:00
simibubi	f0843f3180	Merge pull request #849 from Merlo17/mc1.15/dev ... Updated zapper recipes to use tags	2021-02-05 19:30:03 +01:00
simibubi	a5f5204019	Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev	2021-02-05 19:14:26 +01:00
simibubi	edf654cd4a	ja_jp.json ... - Integrate changes to japanese localization from #879 in the correct file	2021-02-05 19:14:06 +01:00
simibubi	e42925a365	Merge pull request #758 from Bobisnotap/mc1.15/dev ... - Adjusted compat recipe for 'atmospheric'	2021-02-05 19:01:57 +01:00
Odin	ef3d4df944	Translated a bunch of random things	2021-02-05 18:59:58 +01:00
simibubi	2a035a7636	Merge pull request #749 from Chubzik1/patch-1 ... Small fix for an incorrectly translated line	2021-02-05 18:51:15 +01:00
simibubi	5f2f02dab0	Merge pull request #743 from garyyo/mc1.15/dev ... Added missing ae2 compatibility recipe.	2021-02-05 18:50:14 +01:00
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	078d86de66	en_mx.json ... - Integrate es_mx.json from #655 on correct branch and path; with unlocalized entries removed	2021-02-05 18:42:08 +01:00
simibubi	d24851157e	Integrate recent changes to de_de.json ... - Transfer changes made to the template file in #647, #648, #523 to actual lang file	2021-02-05 18:11:18 +01:00
simibubi	c4bc99c3ec	Merge branch 'mc1.15/dev' into patch-3	2021-02-05 17:51:41 +01:00
simibubi	b606a1dc02	Merge pull request #647 from SaurierZockt/patch-2 ... Update de_de.json - needs follow-up changes	2021-02-05 17:49:36 +01:00
simibubi	66b83c1250	Update Localization Readme.txt	2021-02-05 17:48:41 +01:00
JozsefA	d50e07369b	flywheels render with the new tech, and therefore have more accurate lighting	2021-02-04 19:21:25 -08:00
simibubi	72ec08ddfa	Asset attack ... - Fixed floor-mounted cogbrackets not having a particle texture - Redesigned clutch, gearshift, seq. gearshift and speed controller with up-to-date palettes	2021-02-04 23:46:59 +01:00
simibubi	374f3c9547	Climb or Convey ... - Added Gantry shafts and Gantry pinions - Further attempts at stabilizing kinetic propagation - Contraption types can now be added from external code - Kinetic tile entities now have more control over kinetic propagation rules - Added backend for loading schematic configurations globally for any component to see - Encased chain drives are less likely to create a kinetic source loop when wrenched - Piston and Pulley contraptions are less likely to overshoot targets at high speeds	2021-02-04 21:02:30 +01:00
dunois2737	490c53006f	Add files via upload	2021-02-04 21:41:48 +09:00
dunois2737	53d35e4607	Delete zh_tw.json	2021-02-04 20:40:59 +08:00
JozsefA	456ed364a4	Fix another issue with ghost instances. ... Hopefully fix belt lighting issues.	2021-02-04 00:03:37 -08:00
JozsefA	8c0e983f36	An absolutely ridiculous amount of refactoring. Shader system got a complete makeover, but still needs a little work. ... Objective was GL compatibility, now runs with 3.3, 2.0 is target. Remove old tile rendering code. Need to bring back old old (vanilla) tile rendering code.	2021-02-03 23:21:10 -08:00
JozsefA	b766658415	probably fix all issues with ghost instances ... instanced tiles on contraptions now self light properly	2021-02-02 13:11:22 -08:00
JozsefA	f319dd5e8d	fix #1 finally ... start work on shader abstraction use backend for ebos fix some issues with ghost instances, more work to be done	2021-02-01 16:16:35 -08:00
Chexet48	2cdf4057f5	Update it_it.json	2021-02-01 22:59:00 +01:00
dunois2737	4e4ae1333e	zh_tw.json	2021-02-01 21:42:33 +09:00
Snownee	fc459732fc	Fix chute item dupe (#939)	2021-02-01 16:46:36 +08:00
Chexet48	64a7c432d7	Update it_it.json	2021-02-01 05:56:02 +01:00
Chexet48	951860afc8	Update it_it.json	2021-01-31 16:03:34 +01:00
Chexet48	cd63d92cac	Update it_it.json	2021-01-31 13:45:38 +01:00
Snownee	d1e9b76a24	Make deployer still activate when it is triggering advancement	2021-01-31 19:54:27 +08:00
Snownee	7436ceb209	Fix stabilized contraption moving bearing block	2021-01-31 19:24:44 +08:00
Snownee	5c64c2d942	Add server-side check for extendo-grip and contraption interaction	2021-01-31 16:20:42 +08:00
Snownee	4a15fbcec3	Fix funnel filter dupe	2021-01-31 15:28:14 +08:00
Snownee	c5447d5b9c	Add NBTProcessors to enable detailed control to tile data. ... Add safe check when contraption blocks adding back to world	2021-01-31 14:56:46 +08:00
JozsefA	f6b68acbd5	contraptions self light but it's slightly less slow	2021-01-30 15:37:50 -08:00
JozsefA	16b8e1175e	contraptions self light but man it is slow ... optimization in PlacementSimulationWorld.getBlockState	2021-01-30 15:00:26 -08:00
Snownee	0c5e67e347	Merge branch 'mc1.15/security-patches' of https://github.com/pau101/Create into mc1.15/security-patches	2021-01-31 03:44:18 +08:00
Snownee	3525ce49ce	Player Feedback, Part I	2021-01-31 02:12:31 +08:00
Snownee	c77e7c28d7	Fix gauge not rendering behind door	2021-01-30 21:14:58 +08:00
Snownee	7221f72ddf	Optimize contraption assembling	2021-01-30 21:09:04 +08:00
Snownee	08a20972aa	Fix broken render state in RenderWorldLastEvent	2021-01-30 18:51:44 +08:00
Snownee	5a664d6d85	Fix monster spawning on framed glass	2021-01-30 18:35:13 +08:00
TUsama	3ad62d2455	change some details	2021-01-30 12:24:16 +08:00
JozsefA	751fc7192d	fix rotating stuff on contraptions	2021-01-28 23:59:58 -08:00
JozsefA	1de931a122	make pulley key null, could avoid a crash	2021-01-28 14:41:54 -08:00
JozsefA	b63466774b	probably fix the NPEs ... start work on adaptive backend extra sanity stuff for the render manager massive speedup when rendering a lot of tile entities	2021-01-28 14:39:34 -08:00
JozsefA	04ccf6e738	belt light	2021-01-27 16:28:39 -08:00
JozsefA	e690f2b8ac	okay you can use it now ... fixed a lighting bug (with a hack, again) everything now uses the new api (kinetic components on contraptions are slightly broken)	2021-01-27 14:03:18 -08:00
simibubi	433a508107	Find-Replace for Command Blocks ... - Added a new utility command for map-making purposes	2021-01-27 14:26:14 +01:00
JozsefA	67d59540cf	THIS IS NOT READY FOR USE ... new rendering api/pipeline not everything is there yet, but a lot is	2021-01-26 19:45:13 -08:00
_0Steven	53a6ad00d5	Crushing More Bugs ... -Increase the size of the window in which the crusher picks up items to avoid it skipping over items at some of the highest speeds.	2021-01-26 19:11:45 +01:00
Snownee	b958be0712	Fix desync of FilteringBehaviour	2021-01-26 18:00:47 +08:00
Snownee	8f7945ff4e	Fix rope pulley breaking bedrock	2021-01-26 16:48:03 +08:00
Snownee	92a1395b14	Fix spectator can interact with blocks	2021-01-26 15:26:01 +08:00
Snownee	2c3a866494	Fix contraption sticky block connectivity. Add support to PUSH_ONLY push reaction	2021-01-26 15:05:02 +08:00
_0Steven	f1c8e92686	Horizontal Crushers Bugfix ... -Fix bug where horizontal crushers would input items they just output when the belt was 'facing' the opposite direction.	2021-01-25 16:39:47 +01:00
JozsefA	1874b267b3	fix a contraption lighting glitch	2021-01-25 01:58:39 -08:00
JozsefA	93353b61d6	smarter light volumes ... start the process of creating sane gl abstractions stabilized contraption bounds now fit tightly with them fix global tile entity issues	2021-01-25 01:17:55 -08:00
JozsefA	7bac93a03c	fix drill orientation issue in contraptions	2021-01-25 00:24:07 -08:00
TUsama	a03daa1aed	sync to latest version	2021-01-25 13:04:02 +08:00
TUsama	0f3c8fe699	update CHS translation ... Co-Authored-By: MacrousHyucen <69157544+MacrousHyucen@users.noreply.github.com>	2021-01-25 12:40:52 +08:00
_0Steven	7b5737cf82	Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/dev	2021-01-24 16:53:20 +01:00
_0Steven	cb25c5ab21	Omnidirectional Crushing ... -Fix directionality of horizontally placed crushing wheels. -Allow crushing wheels to work omnidirectionally -Allow downwards crushers to deposit directly into belts/chutes/depots and such below. -Allow horizontal crushers to take input from belts going below them. -Allow horizontal crushers to deposit directly into belts/chutes/depots and such placed below, offset by one in the output direction. -Crushers stall when they have a valid output block but cannot actually output. -Crushers outputting in any direction except down will shoot out the item entities with some speed. -Crushers can take entity input from their corresponding input directions rather than just up. However, outputting the entity drops in the right location does currently not work consistently.	2021-01-24 16:46:07 +01:00
simibubi	9d7ddbc326	Entry point	2021-01-24 14:30:05 +01:00
JozsefA	f05497a28c	okay the synchronized functions didn't actually fix it ... but now we actually benefit from the tile entity render filtering, another 2x ish performance	2021-01-24 01:07:22 -08:00
JozsefA	59e29ac958	that was a nasty crash ... os memory exception because memory that was being sent to the gpu was getting modified by another thread	2021-01-23 23:32:23 -08:00
JozsefA	ebd20f5173	suddenly, everything is smooth and dry ... - replace all usages of Minecraft.getRenderPartialTicks() with AnimationTickHolder.getPartialTicks() - refactor stabilized and mounted lighters into one class - separate fancy contraption render logic and entity render logic, should maybe move *all* rendering to ContraptionRenderDispatcher	2021-01-23 23:07:12 -08:00
JozsefA	55ea7e3e55	cart contraptions are lit	2021-01-23 21:02:11 -08:00
JozsefA	dea3f05364	fix saws not rendering their shafts in contraptions	2021-01-23 16:39:11 -08:00
Jozsef	4cbea0f9c9	intel graphics now like the shaders	2021-01-23 15:32:17 -08:00
simibubi	d35bdab51a	The return of dyed belts ... - Dyes can now be used to change the appearance of Mechanical Belts - Fluid items containing water can be used to clean dyed belts	2021-01-23 23:00:27 +01:00
JozsefA	83cb735e62	actors render correctly	2021-01-23 12:49:33 -08:00
JozsefA	cfd60fbc8d	fast actor rendering but it's not correct yet	2021-01-22 18:00:14 -08:00
grimmauld	fbb1c6b221	Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/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	2021-01-22 20:56:46 +01:00
simibubi	525fc03278	Demise of the hopper funnel ... - Added smart chutes - Reworked non-mounted funnels to be consistent will all other funnel configurations - Non-mounted funnels no longer occupy a full block length - Non-mounted funnels can now insert and extract ground items - Vertical funnels can no longer transfer between inventories - Redstone links can now be placed onto any non-empty space - Mechanical arms no longer arbitrarily wait between operations unless targets are overflowing - Gave indicators on funnels better visibility - Chutes now display contents in their goggle overlay - Mechanical Arms and Wrenches can no longer be assigned to filter slots directly	2021-01-22 20:43:59 +01:00
JozsefA	f6518d5c5d	insane amounts of refactoring ... surprisingly it all still works the same, but better maybe still some more cleanup to do	2021-01-22 11:28:39 -08:00
Matteo Merler	7a1817d54d	Update purpur_scope.json	2021-01-22 13:37:30 +01:00
Matteo Merler	bb2d2bbdd9	Update gold_scope.json	2021-01-22 13:37:02 +01:00
Matteo Merler	c75b2e95e7	Update gold_retriever.json	2021-01-22 13:36:42 +01:00
Matteo Merler	6d6ad4f6a4	Update gold_body.json	2021-01-22 13:36:24 +01:00
Matteo Merler	6ab935b85b	Update gold_amplifier.json	2021-01-22 13:36:04 +01:00
Matteo Merler	82fc4637d2	Update gold_accelerator.json	2021-01-22 13:35:41 +01:00
JozsefA	11f9c7459c	prepare for fast actor rendering	2021-01-21 14:14:20 -08:00
JozsefA	697a7df59c	suddenly and magically, contraption rendering is 100% accurate	2021-01-21 12:26:55 -08:00
grimmauld	28cd9a1fe1	Druidcraft woodcutter compatibility	2021-01-20 22:36:04 +01:00
JozsefA	33e66c6e89	pulleys are lit ... stabilized things are sort of lit but man is it jank light volumes have a more sane constructor try to mess around with contraption layering but it's still jank	2021-01-20 00:47:40 -08:00
JozsefA	9df796029f	rename the confounding function	2021-01-18 00:35:16 -08:00
JozsefA	398a848791	pistons are lit and bearings are better lit in the corners ... stop sampling light in places that don't matter	2021-01-18 00:31:33 -08:00
JozsefA	22a90c8e5d	on our way to super fancy contraption lighting	2021-01-17 22:18:31 -08:00
Bobert	32d240f91d	Uhh, didn't know it would do that 😅 ... Un-removed RYS compat, apperently that breaks things	2021-01-16 13:10:08 -07:00
Bobert	1622d71929	The Nerf ... Nerfs Arid Sand splashing, shouldn't hurt pogression anymore. Removes RYS recipes, that mod is being rebuilt and reworked, I will submit new recipes when the new version is released for 1.16	2021-01-16 13:00:58 -07:00
JozsefA	37e64e4c1d	fix vertex attribute data types ... blockcolors and ao now work in contraptions be smarter about allocating buffers use gl buffer mapping, more to come	2021-01-15 16:17:13 -08:00
JozsefA	5ea0fa788f	Make the last tile of its kind disappear	2021-01-15 14:26:27 -08:00
Chubz	645d28ac31	Small fix for an incorrectly translated line ... Everyone makes mistakes, right?	2021-01-15 21:24:33 +04:00
garyantonyo	eaf131c57f	I think this was left in here by mistake.	2021-01-15 01:06:41 -05:00
garyantonyo	b86941a519	Added missing ae2 compatibility recipe.	2021-01-15 00:38:47 -05:00
JozsefA	0bc6b11c5b	be smart about rebuilding things ... not smart enough about contraptions yet things mostly render in the correct layers	2021-01-14 14:00:20 -08:00
Snownee	b1b771ed2e	Fix extendo grip applying knockback on arrow or tnt damage	2021-01-14 12:34:41 +08:00
Snownee	5d0674067f	Fix TooltipHelper formatting	2021-01-14 11:52:48 +08:00
grimmauld	6af884edb7	Merge https://github.com/Creators-of-Create/Create into mc1.15/experimental-rendering	2021-01-13 22:41:59 +01:00
JozsefA	64b5683ac4	things actually pause when paused	2021-01-13 13:24:45 -08:00
JozsefA	03205c277b	move render package up one level	2021-01-13 12:15:48 -08:00
simibubi	f41f7b3efa	Merge branch 'mc1.15/dev' into mc1.16/dev	2021-01-13 18:31:38 +01:00
simibubi	511950b766	Hotfix the fix ... - More safety for the minecart controller capability - Blaze burners now support comparators	2021-01-13 18:28:29 +01:00
grimmauld	07b33b66cc	Merge https://github.com/Creators-of-Create/Create into mc1.15/experimental-rendering	2021-01-13 16:34:45 +01:00
simibubi	877d6dc2ee	Merge branch 'mc1.15/dev' into mc1.16/dev	2021-01-13 15:50:32 +01:00
simibubi	de55778fc5	Extendo clip ... - Fixed extendo grips able to attack entities behind blocks	2021-01-13 15:49:55 +01:00
simibubi	8ba0099e60	Ancient porting oversight ... - Fixed mechanical belts playing destroy effects when placed	2021-01-13 15:30:25 +01:00
simibubi	27b5f5b479	Port new changes	2021-01-13 15:24:48 +01:00
simibubi	db3a579b21	Merge branch 'mc1.15/dev' into mc1.16/dev	2021-01-13 15:11:58 +01:00
simibubi	f47d1e87c1	You were moved ... - runData - Tried addressing some redstone activation inconsistencies with disassembled contraptions	2021-01-13 14:55:29 +01:00
simibubi	0f60e453f3	Merge pull request #715 from Chubzik1/mc1.15/dev ... Update and fixes for ru_ru.json	2021-01-13 14:18:16 +01:00
simibubi	9d5ae97a0a	Thank you weakref, very deterministic ... - Cart controller safety #669, #684, #702, #708, #709, #714, #719, #722, #725, #728 - Update Registrate #662, #677, #697, #726 - Fixed blocks not able to be placed onto a face with super glue - Fixed block duplication involving super glue #681, #682 - Fixed fluid tanks voiding content on contrapion disassembly #707	2021-01-13 14:16:45 +01:00
grimmauld	2b615b68bd	Fix mixins outside dev env	2021-01-13 09:50:00 +01:00
JozsefA	93a1983302	maybe this actually fixes the memory leak	2021-01-12 22:00:24 -08:00
JozsefA	e5b61891fc	update forge and setup mixins	2021-01-12 21:58:40 -08:00
JozsefA	d1dccffc67	fix fan shaft lighting	2021-01-12 12:12:44 -08:00
JozsefA	0ec312340f	rainbow debugging and almost correct tints for contraptions	2021-01-12 01:56:30 -08:00
JozsefA	c567437ede	fix speed controllers not rendering shafts ... switch around render layers for contraptions	2021-01-11 12:08:13 -08:00
JozsefA	1bc99f5224	maybe magically fix all crashes?	2021-01-11 11:15:45 -08:00
Chubz	b1ac81611c	Update and fixes for ru_ru.json ... Updated translation to match latest Create version, with some fixes and improvements for the existing lines	2021-01-11 20:43:13 +04:00
JozsefA	379ff9302b	rotating stuff renders too now	2021-01-11 01:04:18 -08:00
JozsefA	a56d08b78e	a bunch of refactoring to make things easier later ... it's not any more stable but belts render on contraptions rotating things almost do actually fix a bunch of memory leaks	2021-01-11 00:29:02 -08:00
JozsefA	092a92f095	reorganize some stuff ... cart contraptions should at least be positioned correctly maybe fix a bunch of memory leaks	2021-01-09 21:59:11 -08:00
JozsefA	d2173614dc	move lightvolumes down 1 to fix darkness on bottom of contraption	2021-01-09 16:38:30 -08:00
JozsefA	83fa7d34a8	Merge remote-tracking branch 'origin/mc1.15/experimental-rendering' into mc1.15/experimental-rendering	2021-01-09 16:34:31 -08:00
JozsefA	876ddde660	correct contraption lighting	2021-01-09 16:34:22 -08:00
grimmauld	43be3ef8d5	Fix incomplete Render state reset, now doesn't break Journeymap waypoint overlay anymore	2021-01-09 13:16:05 +01:00
JozsefA	7443ac5031	start fixing structure tint	2021-01-08 14:53:22 -08:00
JozsefA	05ab482f70	almost super fast kinetic rendering but we need to detect changes in light first (forge pr?) ... fast contraption rendering	2021-01-08 01:29:18 -08:00
JozsefA	fa1e3ea543	solve lighting	2021-01-07 18:31:46 -08:00
JozsefA	0b3615b50e	time for some organization pt I	2021-01-07 14:57:10 -08:00
JozsefA	ba2d84e92e	whoops	2021-01-07 02:48:24 -08:00
JozsefA	7beeec5e00	maybe lighting is done ... starting fast contraption rendering, not safe to use yet	2021-01-07 02:06:40 -08:00
JozsefA	029f56da57	maybe fix held item rendering	2021-01-06 13:02:57 -08:00
JozsefA	d391ed570e	maybe fix weird rendering in front stuff	2021-01-06 00:04:19 -08:00
JozsefA	91069163f8	clean shader code	2021-01-05 14:50:36 -08:00
JozsefA	a52b606208	all belts render correctly	2021-01-05 14:49:23 -08:00
JozsefA	5144aa6e63	belts scroll the right way, vertical belts still aren't rotated correctly	2021-01-05 14:39:11 -08:00
JozsefA	c9feda18d6	add missing texture	2021-01-05 13:40:04 -08:00
JozsefA	0b1f73de89	missed a comment	2021-01-05 13:32:50 -08:00
JozsefA	566a370e3b	smooth belts	2021-01-05 13:29:45 -08:00
grimmauld	7deb72baa1	Get stuff to compile, clean up unused imports	2021-01-05 11:02:30 +01:00
JozsefA	102e392ab4	merge experimental rendering from 1.16 to 1.15 part II	2021-01-05 10:58:31 +01:00
JozsefA	7d43bb056a	merge experimental rendering from 1.16 to 1.15	2021-01-05 10:56:47 +01:00
simibubi	19434988a7	Port new Changes	2021-01-04 14:16:06 +01:00
simibubi	bf73a24401	Merge branch 'mc1.15/dev' into mc1.16/dev	2021-01-04 14:15:53 +01:00
simibubi	3cdbf47cb9	Adjusted Tooltips	2021-01-04 02:49:47 +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
SaurierZockt	2bb6866547	Update de_de.json ... rest of the translation from to 1 to 30	2021-01-02 19:05:53 +01:00
SaurierZockt	1a03fafd27	Update de_de.json ... translation from row 31 to 119	2021-01-02 18:49:22 +01:00
Bahnschrift	4590231c06	Delete stripped_ethereal_log.json ... There is no ethereal wood in 1.16 biomes of plenty. This recipe causes an error: [16:27:11] [Worker-Main-10/ERROR] [minecraft/RecipeManager]: Parsing error loading recipe create:compat/bop/cutting/stripped_ethereal_log com.google.gson.JsonSyntaxException: Unknown item 'biomesoplenty:stripped_ethereal_log' at net.minecraft.item.crafting.Ingredient.lambda$deserializeItemList$11(Ingredient.java:216) ~[?:?] {re:classloading,pl:accesstransformer:B} at java.util.Optional.orElseThrow(Unknown Source) ~[?:1.8.0_251] {} at net.minecraft.item.crafting.Ingredient.func_199803_a(Ingredient.java:215) ~[?:?] {re:classloading,pl:accesstransformer:B} at net.minecraftforge.common.crafting.VanillaIngredientSerializer.parse(VanillaIngredientSerializer.java:41) ~[forge:?] {re:classloading} at net.minecraftforge.common.crafting.CraftingHelper.getIngredient(CraftingHelper.java:155) ~[forge:?] {re:classloading} at net.minecraft.item.crafting.Ingredient.func_199802_a(Ingredient.java:189) ~[?:?] {re:classloading,pl:accesstransformer:B} at com.simibubi.create.content.contraptions.processing.ProcessingRecipeSerializer.readFromJson(ProcessingRecipeSerializer.java:72) ~[create:mc1.16.3_v0.3b] {re:classloading} at com.simibubi.create.content.contraptions.processing.ProcessingRecipeSerializer.read(ProcessingRecipeSerializer.java:154) ~[create:mc1.16.3_v0.3b] {re:classloading} at com.simibubi.create.content.contraptions.processing.ProcessingRecipeSerializer.func_199425_a_(ProcessingRecipeSerializer.java:22) ~[create:mc1.16.3_v0.3b] {re:classloading}	2021-01-02 22:29:51 +11:00
garyantonyo	d702784293	Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create.git into mc1.15/dev	2021-01-01 22:51:56 -05: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
simibubi	cdf292295a	Why are we still here, Part III ... - Fan washing now supports up to 12 output stacks. For your textbook skyblock insanity. #620 - Chance outputs below 1% no longer show 0% in their tooltip - Fixed creates components picking up dead items #618 - Fixed server-side crash when disassembling contraptions containing a creative crate	2020-12-31 16:02:59 +01:00
garyantonyo	76c17d32e2	add lead crushed ore recipes when Eidolon present	2020-12-31 02:06:57 -05:00
simibubi	d5ac8cb3b9	Why are we still here, Part II ... - Fixed basins dropping outputs when no spoutput is present - Lowered overfeeding threshold for blaze cakes - Brass tunnels no longer distribute in directions against their mounted belt - Fixed capability issues on millstones - Fixed incompatibility with The One Probe	2020-12-29 20:45:21 +01: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
simibubi	2699201661	Merge pull request #593 from Snownee/mc1.15/dev ... Bug fixes	2020-12-27 13:25:54 +01:00
simibubi	27e12e6568	Merge pull request #525 from qkrehf2/patch-1 ... Update ko_kr.json	2020-12-27 13:24:24 +01:00
TUsama	111b63a3c7	0.3 CHS translation ... Co-Authored-By: gloomybanana <29054038+gloomybanana@users.noreply.github.com> Co-Authored-By: Snownee <16059084+Snownee@users.noreply.github.com> Co-Authored-By: MacrousHyucen <69157544+MacrousHyucen@users.noreply.github.com> Co-Authored-By: StarFish <56152035+Imbarainbow@users.noreply.github.com>	2020-12-25 22:41:51 +08:00
Snownee	49b5e4957e	Fix a typo	2020-12-25 18:11:13 +08:00
Snownee	6df81c8272	Fix belt funnel disappearing on contraption	2020-12-25 17:34:45 +08:00
qkrehf2	388b3d9076	Nevermine the past fix. This is the right one	2020-12-25 18:11:54 +09:00
qkrehf2	bc74108933	Fixed Typo Ko_Kr ... I was busy for holidays,, so now I can fix translation	2020-12-25 18:03:02 +09:00
Snownee	e554c5a3ff	Solution to #571	2020-12-25 16:06:32 +08:00
Snownee	0cc6fe1de7	Fix liquid tank contents not being rendered (#588)	2020-12-24 21:28:12 +08:00
Snownee	01602c8e77	Fix: Honey block don't have same ability as slime block (#576)	2020-12-24 18:15:36 +08:00
simibubi	2d92eb0441	Port recent changes	2020-12-22 13:31:23 +01:00
simibubi	c3c834bd2b	Merge branch 'mc1.15/dev' into mc1.16/dev	2020-12-22 13:31:14 +01:00
simibubi	32b0a01c3a	The magical bucket ... - Fixed basins consuming container items with certain output inventories - Potentially fixed item duplication with stale contraption inventories	2020-12-22 13:18:44 +01:00
grimmauld	6b5e223508	Fixed a big dumb dumb	2020-12-21 16:28:08 +01:00
simibubi	ebf980b33c	Itetraitor ... - Fixed crash for schematics containing TE's that have no custom renderer attached - Fixed broken filling recipes with virtual fluids of other mods - Fixed Brass tunnels duplicating/deleting items	2020-12-21 16:05:32 +01:00
grimmauld	0fe8a24041	Controlling the Assembler	2020-12-21 13:03:16 +01:00
grimmauld	f3653d6b15	Fix TE creation assuming other mods don't crash with SchematicWorld instances (#565)	2020-12-21 09:28:41 +01:00
grimmauld	9336931f30	Press no longer go brrr, just bonk	2020-12-21 09:04:11 +01:00
grimmauld	ae399e9c11	Hopefully fix splitter basin duping #557 ... Some more thorough testing is needed here to see whether it is actually fixed. I can't reproduce it anymore at least.	2020-12-20 21:48:27 +01:00
simibubi	89ce9ef826	Bug Fixes ... - Fixed broken serialization of carriage contraptions - Fixed fluid tags crashing the hose pulley	2020-12-19 21:15:04 +01:00
simibubi	59b033f3be	Merge branch 'mc1.15/dev' into mc1.16/dev	2020-12-19 18:34:51 +01:00
simibubi	2a57de3205	Bug Fixes ... - Fixed basin not triggering a recipe check when output fluids are emptied - Fluid behaviour safety on render thread - Wrenchable Depots	2020-12-19 18:05:37 +01:00
qkrehf2	eafd1e9169	Deleted duplicated words	2020-12-20 01:22:33 +09:00
qkrehf2	efe01af06b	Fixed syntax error + {	2020-12-20 00:39:03 +09:00
Zelophed	5a178d2425	Merge branch 'mc1.15/dev' into mc1.16/dev ... # Conflicts: # src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/PistonExtensionPoleBlock.java # src/main/java/com/simibubi/create/foundation/utility/placement/IPlacementHelper.java # src/main/java/com/simibubi/create/foundation/utility/placement/PlacementOffset.java	2020-12-19 16:19:52 +01:00
Zelophed	f45c0ca182	Assisted Placement, Part II ... - helpers now respect waterlogging - add placement helpers for rsc's cogwheel as well as machines with integrated cogwheels	2020-12-19 15:58:03 +01:00
simibubi	ba830dd8d3	Version specific goofage ... - Fixed Deployer not activating blocks	2020-12-19 13:39:06 +01:00
simibubi	ea26ed8a01	Port recent Changes	2020-12-19 13:25:54 +01:00
simibubi	164dae700d	Merge branch 'mc1.15/dev' into mc1.16/dev	2020-12-19 13:25:38 +01:00
simibubi	e2437d1a5c	Bug Fixes ... - Fixed hose pulley not placing source blocks when filling with chocolate or honey - Added a fluid tag to prevent bottomless draining behaviour of hose pulleys - Grindstones can now be moved on contraptions - Fixed fluids zFighting the item drain - Added some crash safety for coupling rendering - Updated mixer tooltip	2020-12-19 13:06:09 +01:00
grimmauld	0182316d36	Waterlogged glass pipes	2020-12-19 11:59:56 +01:00
qkrehf2	d4196df040	Translation Final ... yay 0.3 updates	2020-12-19 12:24:24 +09:00
simibubi	5b3e1e8c38	Prime patching material ... - Fixed open pipe ends not providing fluids to pipe networks - Safety check for pipe attachment rendering	2020-12-19 00:52:41 +01:00
simibubi	27869d6291	Port recent changes	2020-12-18 18:37:15 +01:00
simibubi	ecd5858ece	Merge branch 'mc1.15/dev' into mc1.16/dev	2020-12-18 18:36:51 +01:00
simibubi	62621f8bdd	Mildly problematic ... - Fixed broken kinetic propagation caused by bracket handling - Fixed crash when fluid-interfacing with a contraption loaded from disk	2020-12-18 18:30:58 +01:00
qkrehf2	5dedaebc2e	Update ko_kr.json ... yummy translation	2020-12-18 23:53:01 +09: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
qkrehf2	b47ff875a3	Update ko_kr.json	2020-12-18 12:44:13 +09:00
simibubi	6660718aff	Merge branch 'mc1.15/dev' into mc1.16/dev	2020-12-17 23:32:11 +01:00
simibubi	68e7d3c34c	Bug Fixes ... - Snownee's basin render fix - Fixed milk fluid exchange between vanilla items and the create fluid infrastructure	2020-12-17 23:29:33 +01:00
Daniel Amberson	493cad13d0	i am Indecisive ... yea * brass block got a texture that isn't garbage * added a prototype brass block that might get used later	2020-12-17 15:32:52 -06:00
simibubi	4c91397fbb	Tooltip fix ... - Cleared more remnants of the broken text component transition	2020-12-17 12:35:23 +01:00
Zelophed	1cdfa6c17e	Port recent changes	2020-12-16 18:09:15 +01:00
Zelophed	51229ce517	Merge branch 'mc1.15/dev' into mc1.16/dev ... # Conflicts: # src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionCollider.java # src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/SailBlockPlacementHelper.java # src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/PistonExtensionPoleBlock.java # src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/PistonPolePlacementHelper.java # src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltBlock.java # src/main/java/com/simibubi/create/content/contraptions/relays/elementary/CogWheelBlock.java # src/main/java/com/simibubi/create/content/contraptions/relays/elementary/CogwheelBlockItem.java # src/main/java/com/simibubi/create/content/contraptions/relays/elementary/ShaftBlock.java # src/main/java/com/simibubi/create/events/ClientEvents.java	2020-12-16 17:57:37 +01:00
Zelophed	e950aa268f	Assisted Placement, Part I ... - refactor existing placement helpers - add placement helpers for cogs and shafts	2020-12-16 17:36:22 +01:00
simibubi	743d303bbe	Fix #527	2020-12-16 11:32:12 +01:00
simibubi	fa6bac2bfc	Locally sourced arms ... - Mechanical arms now serialize target positions in relative coordinates	2020-12-16 11:16:46 +01:00
qkrehf2	814c13a8cd	Update ko_kr.json ... advancement translation	2020-12-16 15:21:59 +09: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	64b2c61389	Bug fixes ... - Fixed spout creating potions from any fluid - Fixed pipes not actually transferring the type of fluid selected by layer II flow propagation - Fixed some fluid handlers erasing nbt data of extracted fluidstacks - Fix sidedness issues in Config packets	2020-12-15 23:13:22 +01:00
simibubi	f8b3a77f26	Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev	2020-12-15 21:16:21 +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
qkrehf2	144005059c	Moreee Updates for KR	2020-12-14 17:27:31 +09:00
tterrag	4c26627b73	Fix blaze burner consuming buckets, arm no longer inserts lava buckets	2020-12-13 15:04:55 -05:00
simibubi	bb5efd68f1	Fix #535	2020-12-13 18:23:45 +01:00
simibubi	2a5a2b9e64	Port new Changes	2020-12-13 15:33:56 +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
Snownee	a845a70885	Material checklist I18n	2020-12-13 19:56:49 +08:00
Snownee	48d66c7e55	Slightly improve redstone link performance	2020-12-13 08:19:28 +08: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	a50b9bc6d1	Port new changes	2020-12-12 17:42:19 +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
qkrehf2	6bdaa3d3e8	Update ko_kr.json	2020-12-12 23:46:16 +09: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	f3053d7e45	Remove unused imports	2020-12-12 19:39:02 +08:00
Snownee	24dcb5383a	Make the zapper selection logic server-side (#515)	2020-12-12 19:32:32 +08:00