1296 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Vaern	28666ecabd	Merge remote-tracking branch 'origin/master'	2022-01-05 18:29:36 -08:00
Vaern	e1b9c6f6f5	bit of fixes	2022-01-05 18:29:32 -08:00
Vaern	292d167d61	i am clowning	2022-01-05 16:25:00 -08:00
Vaern	ba91aef9b4	Update WeaponRecipes.java	2022-01-05 16:23:45 -08:00
Vaern	9b97a7dc3a	Merge branch 'HbmMods:master' into master	2022-01-05 16:16:42 -08:00
Vaern	bb9d444920	ugh ... only doing this to appease bob, but what can you do	2022-01-05 16:21:15 -08:00
Bob	49a07b6b74	yeah whatever	2022-01-06 00:24:55 +01:00
Vaern	66ed3ce371	seems to be done	2022-01-04 17:33:13 -08:00
Vaern	5829d5e4cf	aa	2022-01-03 19:37:14 -08:00
Vaern	58502b4b23	ah	2022-01-02 21:17:43 -08:00
Vaern	d3e36fafe4	Merge remote-tracking branch 'origin/master'	2022-01-02 09:42:15 -08:00
Vaern	5547ac4914	aaaaa	2022-01-02 09:42:10 -08:00
Vaern	e5ccf3979d	Merge branch 'HbmMods:master' into master	2022-01-02 09:36:28 -08:00
Bob	05b6d9b95a	detonator improvements, large pylon, more dynamite	2022-01-02 18:33:40 +01:00
Vaern	26e1c36dac	stuff	2022-01-01 14:15:42 -08:00
Vaern	2f9abdf00f	Merge remote-tracking branch 'origin/master'	2022-01-01 10:36:22 -08:00
Vaern	a06fff46ba	seven segment displays work!	2022-01-01 10:36:15 -08:00
Vaern	8de85238ac	Merge branch 'HbmMods:master' into master	2022-01-01 10:31:19 -08:00
Bob	734d1fc66d	the large boys	2022-01-01 19:30:52 +01:00
Vaern	e0fb379b53	breeding reactor funnies	2021-12-31 23:20:59 -08:00
Vaern	f4650eeb45	more small reactor funnies	2021-12-30 22:37:30 -08:00
Vaern	3efe87becd	Merge branch 'HbmMods:master' into master	2021-12-30 13:34:53 -08:00
Vaern	bee5c6d0ea	merge attempt	2021-12-30 13:39:27 -08:00
Bob	65830d76d1	some pylon memes, spent fuel pool NEI handler	2021-12-30 18:46:05 +01:00
Vaern	e40ea77e3b	preliminary small reactor revamp	2021-12-29 22:48:07 -08:00
Vaern	e67d9546f0	Merge branch 'HbmMods:master' into master	2021-12-29 22:42:14 -08:00
Vaern	9be7a1f378	attempts to merge	2021-12-29 22:46:40 -08:00
Bob	8037893637	that should hopefully resolve some garbage	2021-12-29 22:57:45 +01:00
Vaern	e0433a3174	Merge remote-tracking branch 'origin/master'	2021-12-28 17:40:27 -08:00
Vaern	a223f5662c	fixes	2021-12-28 17:40:22 -08:00
Bob	2aaa426feb	fixed batteries not disconnecting, acidizer output stacks 1.0.27X4095	2021-12-26 22:05:44 +01:00
HbmMods	cbc620f646	Merge pull request #372 from Doctor17-git/master ... Updated ru_RU.lang	2021-12-26 21:02:42 +01:00
Doctor17-git	86e821e48c	Updated ru_RU.lang	2021-12-26 23:00:52 +03:00
HbmMods	d4c04926f5	Merge pull request #371 from Vaern/master ... New Achievements!	2021-12-26 20:50:21 +01:00
Vaern	a63686237d	Merge branch 'HbmMods:master' into master	2021-12-26 11:46:10 -08:00
Bob	7967275373	anvil NEI handler, some minor adjustments	2021-12-26 20:45:33 +01:00
Vaern	06166483b7	pile shenanigans	2021-12-25 21:39:38 -08:00
Vaern	b8067eee66	radium rtg pellet	2021-12-25 19:32:55 -08:00
Vaern	b141ccbb40	minor fixes	2021-12-24 14:07:32 -08:00
Vaern	fa0d6adc66	Centrifuge bobcode removed + debris shredding	2021-12-22 12:47:17 -08:00
Vaern	5f6fed5571	Merge branch 'HbmMods:master' into master	2021-12-22 11:52:59 -08:00
Vaern	218cc2bf02	Merge remote-tracking branch 'origin/master'	2021-12-22 11:57:19 -08:00
Vaern	00aa419e98	a few more achieves	2021-12-22 11:57:14 -08:00
Boblet	ced90d7874	bound new centrifuge model, some fluid preparations	2021-12-22 15:53:18 +01:00
Vaern	97d0a67eef	Achievements! ... now with an actual progression and even more witty descriptions	2021-12-21 17:28:00 -08:00
Vaern	cdbf5ba588	Merge branch 'HbmMods:master' into master	2021-12-21 17:24:58 -08:00
Bob	6a83d3ffb2	dynamite, dosimeter fix, new gas centrifuge model	2021-12-21 22:52:04 +01:00
Boblet	43a9f2802e	dosimeter, some texture upgrades	2021-12-21 15:57:59 +01:00
HbmMods	e2af06b02b	Merge pull request #369 from Vaern/master ... Fix for nullpointerexception for gas centrifuge	2021-12-21 08:10:12 +01:00
Vaern	67c5555876	Merge remote-tracking branch 'origin/master'	2021-12-20 19:15:47 -08:00