2938 Commits

Author	SHA1	Message	Date
DBotThePony	42fe77e6b4	Merge branch '1.20.2' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.20.1	2024-01-04 20:10:11 +07:00
DBotThePony	486c9b00c9	Remove text from text field when doing right mouse click, and text field is not multiline	2024-01-04 20:01:14 +07:00
DBotThePony	54ba7e94c6	Cursor type for android research tree	2024-01-04 19:59:57 +07:00
DBotThePony	ed73c9fda8	Always display transfer history when pressing shift	2024-01-04 19:41:05 +07:00
DBotThePony	f4bbf54095	Android station coloring	2024-01-04 19:37:36 +07:00
DBotThePony	c69781c22c	Fix cursor wars between panels when grabbing mouse input	2024-01-04 19:08:20 +07:00
DBotThePony	70ec49e546	Display panel's mouse cursor if it grabs mouse input	2024-01-04 18:58:20 +07:00
DBotThePony	dbc793a592	Add hand cursor to progress gauge panel	2024-01-04 18:53:12 +07:00
DBotThePony	c52995541b	Mouse cursors support	2024-01-04 18:36:52 +07:00
DBotThePony	005c8b0396	Holo sign text coloring	2024-01-04 17:48:56 +07:00
DBotThePony	a72f2aabb2	Make underwater travel challenge account for displacement, and not distance	2024-01-04 16:57:10 +07:00
DBotThePony	ebafdbc925	Set MAX_ENERGY default config value to infinity	2024-01-04 16:38:09 +07:00
DBotThePony	9800eb35ba	Fixed energy consumption not being merged properly	2024-01-04 16:37:41 +07:00
DBotThePony	b3651b1f86	Powered furnace cleanup	2024-01-04 16:26:42 +07:00
DBotThePony	8aa34b3645	Induction furnace and powered furnace painting	2024-01-04 15:57:12 +07:00
DBotThePony	26cb0c8cba	Implement matter recycler coloring	2024-01-04 15:11:38 +07:00
DBotThePony	ce8c257928	Some cleanup of code from previous commits	2024-01-04 14:57:33 +07:00
DBotThePony	3f2e90e55c	Merge remote-tracking branch 'origin/1.20.2' into 1.20.2	2024-01-04 14:06:48 +07:00
DBotThePony	5b51c5e655	Microwave oven painting	2024-01-04 14:06:23 +07:00
GearShocky	071bb7b3ad	Chug xp	2024-01-04 12:46:19 +06:00
DBotThePony	9ecf53342e	More machine coloring	2024-01-04 13:40:40 +07:00
GearShocky	895ed6fbef	Fix Computer 1000 yard stare + 4chair	2024-01-04 12:38:38 +06:00
DBotThePony	9d876c573c	Merge remote-tracking branch 'origin/1.20.2' into 1.20.2	2024-01-04 12:07:45 +07:00
DBotThePony	0c004aedc5	Some unifications regarding item tooltips	2024-01-04 01:06:55 +07:00
DBotThePony	1e8aecb5d7	Maintain inner list of decorative blocks to register	2024-01-04 00:00:06 +07:00
DBotThePony	f36019b4ef	Subscribe to these vents only when running client	2024-01-03 23:50:05 +07:00
DBotThePony	8f92b8d3f1	Add computer terminal as actual block	2024-01-03 20:46:51 +07:00
DBotThePony	800fd54d8e	Explicitly inherit string matter value for wool	2024-01-03 20:04:46 +07:00
DBotThePony	0dcf6664a3	Add painter recipes to matter recipe finder	2024-01-03 20:03:23 +07:00
DBotThePony	b2c2bfa536	Plate press coloring	2024-01-03 19:56:50 +07:00
DBotThePony	d6dc8689f8	Essence storage coloring	2024-01-03 18:51:59 +07:00
DBotThePony	cb50ee2c68	Colored machines test, update creative menu order ... update SupplierList/Map impl to use Java's suppliers general code layout improvements	2024-01-03 18:36:06 +07:00
GearShocky	73773d4c70	tele jigsaw grunt pathic telepathic st'ructure processor jigsaw worldgenjson	2024-01-03 16:53:27 +06:00
DBotThePony	0ab411fd90	Add "none" to BlockRotationFreedom	2024-01-03 15:11:49 +07:00
DBotThePony	565819c3e3	Add placeholder textures for liquid xp	2024-01-03 15:06:36 +07:00
DBotThePony	c5ea764848	Shorten configuration titles	2024-01-03 15:04:27 +07:00
DBotThePony	56db45a0d4	Add liquid xp locale strings	2024-01-03 15:03:20 +07:00
DBotThePony	e08c81520f	Actually expose fluid handler of essence storage	2024-01-03 15:00:50 +07:00
GearShocky	6e16364491	Laboratory rebuild WIP + decorative computer model	2024-01-03 09:57:03 +06:00
DBotThePony	2ae5166a01	Merge branch '1.19.4' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.3	2024-01-02 18:08:55 +07:00
DBotThePony	cac468685e	Merge branch '1.20.1' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.4	2024-01-02 18:08:37 +07:00
DBotThePony	78ac178526	Merge branch '1.20.2' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.20.1	2024-01-02 18:08:11 +07:00
DBotThePony	c5313d405b	Actually make metal beams behave like pillars	2024-01-02 18:06:14 +07:00
DBotThePony	37ce7343d4	Fix damage type names	2024-01-02 15:29:40 +07:00
DBotThePony	0944e55141	Merge branch '1.19.4' into 1.19.3	2024-01-02 15:16:33 +07:00
DBotThePony	c98562f2cb	Merge branch '1.20.1' into 1.19.4	2024-01-02 15:16:32 +07:00
DBotThePony	92f2680feb	Use appropriate texture for status effect background	2024-01-02 15:16:28 +07:00
DBotThePony	783c2bde34	Merge branch '1.19.4' into 1.19.3	2024-01-02 15:05:26 +07:00
DBotThePony	b8f98f0e9e	Merge branch '1.20.1' into 1.19.4	2024-01-02 15:05:25 +07:00
DBotThePony	077e82064b	Merge branch '1.20.2' into 1.20.1	2024-01-02 15:05:25 +07:00
DBotThePony	e6203e11b5	Fallback to zero if there is excess data when deserializing infinities	2024-01-02 15:05:22 +07:00
DBotThePony	cae417b3b4	Fix item icons not being rendered correctly	2024-01-02 14:38:58 +07:00
DBotThePony	57cc9730f8	Merge branch '1.19.4' into 1.19.3	2024-01-02 13:53:50 +07:00
DBotThePony	1d68f32b19	Fix multiplayer RecipeSerializer.codec ... # Conflicts: # build.gradle.kts	2024-01-02 13:53:33 +07:00
DBotThePony	6b6f9f8062	Merge branch '1.19.4' into 1.19.3	2024-01-02 12:26:48 +07:00
DBotThePony	6e4bf4e7ec	Merge branch '1.20.2' into 1.20.1	2024-01-02 12:26:47 +07:00
DBotThePony	ae544e8844	Merge branch '1.20.1' into 1.19.4	2024-01-02 12:26:47 +07:00
DBotThePony	0a5dbf468f	Update author list	2024-01-02 12:24:09 +07:00
DBotThePony	5b45cf7d0a	Merge branch '1.20.2' into 1.20.1	2024-01-02 12:22:08 +07:00
DBotThePony	46d5f8b76b	Revert import changes	2024-01-02 12:21:48 +07:00
DBotThePony	ea448788c5	Merge branch '1.19.4' into 1.19.3	2024-01-02 12:10:51 +07:00
DBotThePony	37e7f42587	add missing import	2024-01-02 12:10:43 +07:00
DBotThePony	34a9bfd48a	Merge branch '1.19.4' into 1.19.3	2024-01-02 12:01:48 +07:00
DBotThePony	7f15ae6a3a	Merge branch '1.20.1' into 1.19.4	2024-01-02 12:01:30 +07:00
DBotThePony	edea36a8a6	Merge branch '1.20.2' into 1.20.1	2024-01-02 12:00:12 +07:00
DBotThePony	113db7fa9e	Add microwave oven block shape	2024-01-02 11:53:52 +07:00
DBotThePony	063095df10	Merge branch 'master' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into master	2024-01-02 11:42:45 +07:00
GearShocky	76de15f01b	Update the texture for metal beams and lamps	2024-01-02 00:15:39 +06:00
GearShocky	ea448c5262	More texture adjustments	2024-01-01 23:51:32 +06:00
GearShocky	355242b470	Merge remote-tracking branch 'origin/master'	2024-01-01 23:17:20 +06:00
GearShocky	ffa94d190d	Microwave	2024-01-01 23:16:59 +06:00
DBotThePony	8a891e6ffb	Merge branch '1.19.4' into 1.19.3	2024-01-01 22:44:09 +07:00
DBotThePony	ad76b4cabc	Fix tooltips being wrongly positioned	2024-01-01 22:41:58 +07:00
DBotThePony	9cf66e443e	Fix items being rendered with 1 pixel offset	2024-01-01 22:24:15 +07:00
DBotThePony	2506f0fe0e	Fix missed translatable contents	2024-01-01 22:17:23 +07:00
DBotThePony	2aa084290b	Make mod compile against 1.19.3	2024-01-01 22:15:32 +07:00
DBotThePony	b9f6b65900	Make main source set compile against 1.19.3	2024-01-01 22:12:39 +07:00
DBotThePony	41ce2841b1	More backporting	2024-01-01 22:04:53 +07:00
DBotThePony	a5ba27cf63	More backporting	2024-01-01 22:04:26 +07:00
DBotThePony	7b415fbce3	More backporting	2024-01-01 22:01:57 +07:00
DBotThePony	2a117a540e	More backporting	2024-01-01 21:07:43 +07:00
DBotThePony	df15bd2f69	More backporting	2024-01-01 17:55:27 +07:00
GearShocky	6bee0784d3	Texture adjustments	2024-01-01 16:42:47 +06: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	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	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	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	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
DBotThePony	e5a982ae13	Caused by: java.lang.invoke.LambdaConversionException: Invalid receiver type int; not a subtype of implementation type class java.lang.Integer	2023-12-31 22:25:55 +07:00
DBotThePony	f942093e4f	Don't embed condition json by default	2023-12-31 22:23:16 +07:00
DBotThePony	5d15611f84	Update mods.toml	2023-12-31 22:20:48 +07:00
DBotThePony	1803d687ab	Make mod compile against 1.20.1	2023-12-31 22:18:43 +07:00
DBotThePony	347be35184	Make main source set compile	2023-12-31 22:08:15 +07:00
DBotThePony	aa0a283e06	More backporting	2023-12-31 21:40:54 +07:00
DBotThePony	98fcacc9a8	More backporting	2023-12-31 21:14:32 +07:00
DBotThePony	422ae92303	More backporting	2023-12-31 21:02:52 +07:00
DBotThePony	7683cacc29	More backporting	2023-12-31 20:42:20 +07:00
DBotThePony	520112df77	Backport MCriterionTrigger to 1.20.1	2023-12-31 20:29:57 +07:00
DBotThePony	5453c8c793	Merge branch 'master' into 1.20.1	2023-12-31 20:25:03 +07:00
DBotThePony	1681a7bf4a	Streamline trigger instances into single, more portable class	2023-12-31 20:23:45 +07:00
DBotThePony	3c5ea937a5	More backporting	2023-12-31 18:23:07 +07:00
DBotThePony	f16483d7c0	Some recipe backporting	2023-12-31 17:46:56 +07:00
DBotThePony	8072a7b135	Don't check for "chunk send" status because it is already sent during event fire	2023-12-31 17:08:45 +07:00
DBotThePony	242876d533	Migrate to custom network context	2023-12-31 17:01:57 +07:00
DBotThePony	be52bbdc59	Fix not accounting initial cable node limit when transfering energy	2023-12-31 10:53:55 +07:00
DBotThePony	6be24540a5	Don't remove self from lively nodes when all we can do is self-feed	2023-12-31 10:29:27 +07:00
DBotThePony	a162caefb6	Use pecrentage function	2023-12-31 10:07:44 +07:00
DBotThePony	8d222125b5	Specify max battery of cables as positive infinity	2023-12-31 09:41:03 +07:00
DBotThePony	1c0cdb8b5b	Energy cable tiers, fix some Client -> Server logic leaks in singleplayer	2023-12-30 20:26:31 +07:00
DBotThePony	023081eaaa	Fix accidental LIFO order on tick list when queueing ticks (when it always should be FIFO)	2023-12-30 19:57:21 +07:00
DBotThePony	7c9657c6d2	Get rid of block entity specific onceLevel	2023-12-29 16:43:28 +07:00
DBotThePony	d5f1d3cde0	e	2023-12-29 16:41:56 +07:00
DBotThePony	35e0bc65da	Add more specifics to cable energy cap	2023-12-29 16:39:19 +07:00
DBotThePony	79aeca5720	Energy cables test	2023-12-29 16:35:32 +07:00