1695 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Boblet	bd66140b54	GUI fluid identifier	2022-05-03 15:45:00 +02:00
HbmMods	d3e713f977	Merge pull request #597 from Vaern/master ... Magnifique	2022-05-03 08:23:09 +02:00
Vaern	31dddc8da1	Revert "yeah" ... This reverts commit a1e9edd459a78455ecaca89d5e20b8c0826ddf2e.	2022-05-02 18:10:33 -07:00
Vaern	a1e9edd459	yeah	2022-05-02 18:07:56 -07:00
Vaern	7800b1d1e2	Merge remote-tracking branch 'HbmMods/master'	2022-05-02 17:51:41 -07:00
Vaern	9bf5082236	magnifique ... delicious	2022-05-02 17:51:36 -07:00
HbmMods	80ad7be8c7	Merge pull request #596 from Vaern/master ... it's just you and me	2022-05-02 10:59:11 +02:00
Vaern	e63afbee10	Merge remote-tracking branch 'origin/master'	2022-05-01 20:10:48 -07:00
Vaern	c3aee19b3a	pile shenanigans pt. 2	2022-05-01 20:10:29 -07:00
Vaern	5c2c4d300e	pile shenanigans	2022-05-01 20:10:29 -07:00
Vaern	71115ec066	pile shenanigans pt. 2	2022-05-01 20:10:18 -07:00
Bob	e12be50ce6	small fixes	2022-05-01 21:18:12 +02:00
Vaern	cc4b0d01c0	pile shenanigans	2022-04-30 23:07:14 -07:00
Bob	739a6b4b47	oh boy it's 2 in the morning	2022-05-01 01:38:26 +02:00
HbmMods	ef921967c0	Merge pull request #592 from Vaern/master ... Schrab fuel & waste + HEN recycling, gas centrifuge gating rebalancing	2022-04-30 16:53:48 +02:00
Vaern	0316408cee	there you go	2022-04-29 16:17:36 -07:00
Vaern	2c14cd6a74	oh yeah, for less CBT ... this way the dosimeter should still be more useful whilst not being as bad	2022-04-28 19:39:12 -07:00
Vaern	d7ded5f2cb	Schrab Fuel & Waste recycling, HEN recycling, GC gating rebalancing	2022-04-28 19:19:49 -07:00
Vaern	60fd084e80	Merge remote-tracking branch 'HbmMods/master'	2022-04-28 17:26:48 -07:00
Boblet	a77291528c	configurable chemplant recipes	2022-04-28 13:21:51 +02:00
Vaern	aa29deec7d	Revert "." ... This reverts commit fe5d0ee3001ea34ab1f1f95e826abeb305513299.	2022-04-27 19:16:50 -07:00
Vaern	fe5d0ee300	.	2022-04-27 18:37:36 -07:00
Vaern	e1296cdd36	Merge remote-tracking branch 'HbmMods/master'	2022-04-27 17:30:20 -07:00
Bob	9328cbbd20	first working test for universal JSON recipes	2022-04-27 23:20:37 +02:00
Vaern	2a97d10cf6	tiny little baby pr	2022-04-27 08:43:59 -07:00
Vaern	890a47e64e	Merge remote-tracking branch 'HbmMods/master'	2022-04-27 08:16:46 -07:00
Boblet	b01e260db9	universal system for JSON based recipe configuration	2022-04-27 16:50:34 +02:00
HbmMods	3b70d57dde	Merge pull request #577 from Ambersol13/master ... Update SILEXRecipes.java	2022-04-27 08:47:59 +02:00
Vaern	b171943eb7	Merge remote-tracking branch 'HbmMods/master'	2022-04-26 18:29:22 -07:00
Bob	2e3e47fce7	mug recipe 1.0.27X4215	2022-04-25 21:27:47 +02:00
Boblet	bdfda34985	some heatex fixes	2022-04-25 16:51:14 +02:00
Vaern	b350beabaa	Merge remote-tracking branch 'HbmMods/master'	2022-04-24 17:36:49 -07:00
HbmMods	fc79135be8	Merge pull request #584 from Doctor17-git/master ... Updated ru_RU.lang	2022-04-24 22:07:04 +02:00
Doctor17-git	493e49bac0	Updated ru_RU.lang	2022-04-24 22:49:42 +03:00
Bob	079045c48f	well if it isn't sussy jack 1.0.27X4214	2022-04-24 21:03:19 +02:00
HbmMods	22aa659299	Merge pull request #580 from Vaern/master ... Generator for small- to medium-sized structures based on MapGenStructure	2022-04-24 10:57:37 +02:00
Vaern	fc3f779408	dude	2022-04-23 21:02:32 -07:00
Vaern	aa59eedf7d	well that's annoying	2022-04-23 20:58:16 -07:00
Vaern	c2d4b8734f	Merge remote-tracking branch 'HbmMods/master'	2022-04-23 20:12:00 -07:00
Vaern	0ba3b93e56	argh	2022-04-23 20:11:53 -07:00
Bob	98b0f46afe	obj util better color multiplication, an affront to god	2022-04-24 00:01:53 +02:00
Vaern	cd7650fdda	a	2022-04-23 14:32:50 -07:00
Vaern	56f97e531c	Merge remote-tracking branch 'HbmMods/master'	2022-04-23 14:28:57 -07:00
Vaern	ad504471c8	merci	2022-04-23 14:28:41 -07:00
Vaern	1a444c0b82	AAAAAAAAAAAAAAAAAA	2022-04-22 22:18:05 -07:00
Boblet	5f1c5cc5ba	a bit of fluid IO, tooltips for hadron power plugs	2022-04-22 15:24:48 +02:00
Vaern	d3fe07f0df	goddamn you	2022-04-21 20:07:11 -07:00
Vaern	115431ae00	mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm ... yes, workshop	2022-04-21 20:06:38 -07:00
Bob	85165e0621	large door, some more fixes	2022-04-21 23:34:51 +02:00
Boblet	bc98b85c19	fluid IO stuff once again, press preheater	2022-04-21 16:11:28 +02:00