3737 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
70000hp	ec84179e3f	god DAMN ... Implemented switching between copiable traits + big change in logic thanks martinthedragon	2024-08-16 19:41:53 -04:00
70000hp	54ec5e7028	Merge branch 'master' into more-more-qol	2024-08-12 17:44:05 -04:00
70000hp	1495dfc2b5	pain	2024-08-12 17:38:15 -04:00
Boblet	d70ea038a0	an big slappy	2024-08-12 16:26:09 +02:00
HbmMods	e6ba0d1e2b	Merge pull request #1615 from Creeper-banner/bob ... Update zh_CN.lang	2024-08-10 23:12:39 +02:00
HbmMods	85d3ffae27	Merge pull request #1603 from RosaTryp/machine-configs ... Added config options for centrifuge	2024-08-10 23:11:29 +02:00
HbmMods	7411908e7e	Merge pull request #1616 from MellowArpeggiation/master ... I fucked up the light recipes	2024-08-10 23:10:58 +02:00
Bob	c560c7d580	missiles with more oomph	2024-08-10 23:10:28 +02:00
Creeper-banner	8fe3912259	Change lore book translations to avoid copyright problems	2024-08-10 22:05:10 +08:00
Creeper-banner	eaaa569a24	Update zh_CN.lang	2024-08-10 19:48:08 +08:00
Creeper-banner	1a5874f6a1	Update zh_CN.lang	2024-08-10 07:15:33 +08:00
George Paton	fc9443b7bf	boy I hope somebody got fired for that blunder	2024-08-07 12:54:10 +10:00
Creeper-banner	9ea3196579	Update zh_CN.lang	2024-08-07 07:21:59 +08:00
Creeper-banner	73dd37eaf2	Update and rename zh_CN.lang_ to zh_CN.lang	2024-08-07 06:54:16 +08:00
Creeper-banner	aaa66fcde6	Delete src/main/resources/assets/hbm/lang/zh_CN.lang	2024-08-07 06:54:03 +08:00
Creeper-banner	0a28befc8d	Update and rename zh_CN.lang to src/main/resources/assets/hbm/lang/zh_CN.lang_	2024-08-07 06:53:49 +08:00
Creeper-banner	0443ead08f	Update zh_CN.lang	2024-08-07 06:51:36 +08:00
Creeper-banner	f88f262383	Merge branch 'HbmMods:master' into bob	2024-08-07 06:47:03 +08:00
Bob	4aa87bc009	just fuck em	2024-08-07 00:11:18 +02:00
Creeper-banner	5217d24904	Update zh_CN.lang	2024-08-06 07:40:36 +08:00
70000hp	622330b4cf	forgor	2024-08-05 19:19:24 -04:00
Bob	9ebcab3244	fixes, plushies	2024-08-05 00:47:32 +02:00
70000hp	90d552c03a	the power of friendship isn't working anymore ... I need to kill this motherfucker	2024-08-03 19:26:15 -04:00
70000hp	492d6520ae	Merge branch 'master' into more-more-qol	2024-08-03 17:23:35 -04:00
HbmMods	522c4e1b24	Merge pull request #1608 from MellowArpeggiation/master ... Accurate collision geometry on chemplant and assembler	2024-08-03 13:14:46 +02:00
Bob	aaaaac92eb	fixes, recipe changes	2024-08-03 13:11:14 +02:00
George Paton	18e1542663	fuck you *adjusts your collision*	2024-08-03 19:12:30 +10:00
Bob	f97076bb94	guh	2024-08-02 23:43:19 +02:00
RosaTryp	6d33277df0	Merge branch 'HbmMods:master' into machine-configs	2024-07-31 08:10:46 +00:00
Bob	7ba7f8c6c6	models	2024-07-30 23:14:04 +02:00
RosaTryp	8aebde12bb	Added config options for centrifuge	2024-07-30 22:37:51 +02:00
70000hp	d379e1e3a0	Merge branch 'master' into more-more-qol	2024-07-28 12:11:15 -04:00
Bob	44585d3c8b	baa 1.0.27_X5036	2024-07-24 13:31:25 +02:00
70000hp	ef586c78c0	Merge branch 'master' into more-more-qol	2024-07-20 20:28:21 -04:00
70000hp	164ec9a192	Settings tool and first impl	2024-07-20 20:28:13 -04:00
Boblet	8e767e51e3	ultra shit sounds	2024-07-19 11:56:38 +02:00
Boblet	8a200a50bd	better particle spawner structure, killed off boilers	2024-07-18 16:04:41 +02:00
Boblet	b3047c875e	welcome to super cancer world	2024-07-17 16:38:05 +02:00
Boblet	efee0706af	you can, in fact, wire a WIAJ into a particle renderer	2024-07-17 10:37:12 +02:00
Boblet	83f8c5a7f9	why	2024-07-16 16:30:03 +02:00
Boblet	02c9582b21	fuck, whatever	2024-07-15 14:29:53 +02:00
Boblet	f8465b5071	flixes 1.0.27_X5027	2024-07-15 13:11:13 +02:00
Bob	7896c0443a	the death of RNG 1.0.27_X5026	2024-07-14 20:48:35 +02:00
HbmMods	eaaa78c384	Merge pull request #1584 from FOlkvangrField/Configurable-Converter ... Added conversion ratio configuration options for Rf and He in hbmMachines.json for the two converters	2024-07-14 13:37:35 +02:00
Bob	e7428fb5ab	camera, lights, action	2024-07-14 13:35:28 +02:00
FOlkvangrField	d17b1cb4f0	Added conversion ratio configuration options for Rf and He in hbmMachines.json for two converters	2024-07-14 19:18:49 +08:00
Boblet	01830fd877	as straightforward as the nordring	2024-07-12 14:56:47 +02:00
HbmMods	9b0bd4d180	Merge pull request #1576 from 70000hp/electrolyzer-electric-boogaloo ... Electrolyzer improvements part 2	2024-07-11 16:06:06 +02:00
Boblet	28e1fdd7f5	cleanup	2024-07-11 16:05:25 +02:00
70000hp	301a932257	cant win with friends and family	2024-07-11 09:48:51 -04:00