2879 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
DBotThePony	2a117a540e	More backporting	2024-01-01 21:07:43 +07:00
DBotThePony	df15bd2f69	More backporting	2024-01-01 17:55:27 +07:00
DBotThePony	3dab053420	Merge branch '1.19.4' into 1.19.3	2024-01-01 17:31:45 +07:00
DBotThePony	7258e1e4d3	Merge branch '1.20.1' into 1.19.4	2024-01-01 17:31:35 +07:00
DBotThePony	34ef50f6ee	Merge branch '1.20.2' into 1.20.1	2024-01-01 17:31:29 +07:00
DBotThePony	2cc8215cb0	Revert "Polyfill dataresult" ... This reverts commit e3df0d82e0.	2024-01-01 17:30:48 +07:00
DBotThePony	4c5c2362ce	Merge branch '1.20.2' into 1.20.1	2024-01-01 17:29:28 +07:00
DBotThePony	e3df0d82e0	Polyfill dataresult	2024-01-01 17:28:46 +07:00
DBotThePony	0a5ae54614	Some backporting	2024-01-01 17:18:57 +07:00
DBotThePony	45dd3e5c4b	Downgrade dependencies	2024-01-01 17:02:19 +07:00
DBotThePony	5ad9d49537	Merge branch '1.20.1' into 1.19.4	2024-01-01 16:51:04 +07:00
DBotThePony	54fa8a252e	Merge branch '1.20.2' into 1.20.1	2024-01-01 16:51:04 +07:00
DBotThePony	18965ccfc7	god damn it	2024-01-01 16:50:37 +07:00
DBotThePony	4e3ca82fc7	Destroy cables on piston push instead of block	2024-01-01 16:43:11 +07:00
DBotThePony	d84af00876	Merge branch '1.20.1' into 1.19.4	2024-01-01 16:41:39 +07:00
DBotThePony	a9cb2db3b4	Merge branch '1.20.2' into 1.20.1	2024-01-01 16:38:01 +07:00
DBotThePony	64b8346424	Specify proper piston push behavior for most blocks	2024-01-01 16:37:42 +07:00
DBotThePony	454e4f6a63	Merge branch '1.20.1' into 1.19.4	2024-01-01 15:47:43 +07:00
DBotThePony	6dbd942626	Merge branch 'master' into 1.19.4	2024-01-01 15:47:20 +07:00
DBotThePony	748a232569	Merge branch 'master' into 1.20.1	2024-01-01 15:45:06 +07:00
DBotThePony	50112bfbaf	Don't make cables seem to be interactable	2024-01-01 15:00:50 +07:00
DBotThePony	da4c1108c2	Fix slot panel quick move display	2024-01-01 14:45:37 +07:00
DBotThePony	c4bcab44e4	Merge branch '1.20.1' into 1.19.4	2024-01-01 14:24:59 +07:00
DBotThePony	8e469c309d	Make datagen run?	2024-01-01 14:23:28 +07:00
DBotThePony	f3bf84a7a2	Make mod compile against 1.19.4	2024-01-01 12:19:07 +07:00
DBotThePony	b6643a6dd3	Make main source set compile against 1.19.4	2024-01-01 12:10:02 +07:00
DBotThePony	31268e33ef	Merge branch 'master' into 1.19.4	2024-01-01 12:01:33 +07:00
DBotThePony	86c426a504	Merge branch 'master' into 1.20.1	2024-01-01 11:45:14 +07:00
DBotThePony	3db63aa589	Add MatteryContainer.ContainerListener	2024-01-01 11:45:06 +07:00
DBotThePony	afe7d698c8	More backporting	2024-01-01 11:39:30 +07:00
DBotThePony	0bcc078fe9	More backporting	2024-01-01 11:19:20 +07:00
DBotThePony	e3e02dbad2	More backporting	2024-01-01 03:28:59 +07:00
DBotThePony	e563b85946	Some backporting	2024-01-01 03:22:05 +07:00
DBotThePony	cc82146f0a	Remove import	2024-01-01 03:00:55 +07:00
DBotThePony	f4ec4c9066	Merge branch '1.20.1' into 1.19.4	2024-01-01 02:57:10 +07:00
DBotThePony	108b49bedb	Merge branch 'master' into 1.20.1	2024-01-01 02:55:55 +07:00
DBotThePony	716d251ca0	More MGUIGraphics moves	2024-01-01 02:51:54 +07:00
DBotThePony	1dab485d29	Specify font implicitly	2024-01-01 02:46:00 +07:00
DBotThePony	d81d7885c0	And move it to render subpackage	2024-01-01 02:40:58 +07:00
DBotThePony	311de079fa	Add polyfill guigraphics	2024-01-01 02:39:58 +07:00
DBotThePony	1a5a9a6303	Use curseforge curios version	2024-01-01 01:59:34 +07:00
DBotThePony	bf46ac0647	Downgrade dependencies	2024-01-01 01:54:17 +07:00
DBotThePony	71850b38e5	Merge branch 'master' into 1.20.1	2024-01-01 00:58:18 +07:00
DBotThePony	2e23ce1a04	One more isCancelable	2024-01-01 00:58:17 +07:00
DBotThePony	796f29127f	Merge branch 'master' into 1.20.1	2024-01-01 00:13:22 +07:00
DBotThePony	75681fb4c4	Specify isCancelable directly	2024-01-01 00:13:15 +07:00
DBotThePony	8c43a3ec6d	Merge branch 'master' into 1.20.1	2023-12-31 23:18:46 +07:00
DBotThePony	023ad54b33	Various fixes related to number handling	2023-12-31 23:18:23 +07:00
DBotThePony	477e782c7c	*french disappointment*	2023-12-31 22:44:28 +07:00
DBotThePony	65cf8bf9df	Fixes to data loading	2023-12-31 22:43:02 +07:00