1734 Commits

Author SHA1 Message Date
Boblet
13c4cdc24d cryo cannon 2023-07-11 16:06:44 +02:00
Bob
18a1b103ba some pistol tweaks, compressor fix, cryo cannon texture 2023-07-10 21:38:41 +02:00
Boblet
de028bb5e1 UAC pistol, damage util crap, mk5 fix 2023-07-10 15:48:09 +02:00
Bob
b443c3449d fuck you fuck you fuck you fuck you fuck you fuck you fuck you fuck you 2023-07-09 19:46:38 +02:00
Bob
925236e538 iboiler texture, coilgun, bunch of fixes, recipes 2023-07-09 17:28:11 +02:00
Boblet
873e41558f and now for something completely different 2023-07-07 09:20:32 +02:00
Bob
bc8dfcaa99 coolers 2023-07-06 20:48:25 +02:00
Boblet
e78406f64f redstone over radio item counter 2023-07-06 15:33:05 +02:00
HbmMods
69fc7b826f
Merge pull request #1102 from Toshayo/master
Fixed satellite loot being overridden by lunar mining ship
2023-07-05 22:43:50 +02:00
Bob
25a7a6c345 new multiblock sys for assembler 2023-07-05 22:42:36 +02:00
Bob
5f109b61ec i can't feel my limbs 2023-07-05 22:26:20 +02:00
Toshayo
c5d1960842
Fixed satellite loot being overridden by lunar mining ship 2023-07-05 21:20:58 +02:00
Boblet
ea9dc777fb labels, glyphid egg recycling 2023-07-05 16:37:22 +02:00
Bob
4ad28d25f4 industrial boiler 2023-07-04 22:12:10 +02:00
Boblet
d09813957e small fixes 2023-07-03 15:41:39 +02:00
Bob
e6fd6900bb oop 2023-07-02 19:00:34 +02:00
Bob
843efd575e some train stuff 2023-07-02 18:59:47 +02:00
Bob
d45f0098d5 *chuckles* i'm in danger 2023-07-01 21:52:08 +02:00
Bob
65ed6a4f9a helium 4 plasma 2023-07-01 21:43:29 +02:00
HbmMods
738e698d72
Merge pull request #1096 from HbmMods/pr1083
Pr1083
2023-07-01 20:27:59 +02:00
Bob
e46acfb19a beep beep 2023-07-01 20:26:53 +02:00
Bob
8bc1f73075 big smoke 2023-07-01 19:19:09 +02:00
Boblet
fcfa725f0b pipable exhaust 2023-06-30 11:57:28 +02:00
Boblet
68f9f20f5c some tweaks 2023-06-30 08:07:34 +02:00
HbmMods
4f67d5b11f
Merge branch 'pr1083' into master 2023-06-30 07:56:09 +02:00
HbmMods
0b36b76f3e
Merge pull request #1084 from Voxelstice/pylon-stuff
Wiring errors with slightly more info
2023-06-30 07:54:05 +02:00
Bob
7c1d5bd3e3 fixes, localization, chimney 2023-06-29 20:59:13 +02:00
Boblet
61132bd310 I REMBER 2023-06-29 16:08:32 +02:00
Bob
cd12d6d9af configs configs, glyphid meat, yummy yummy fruit salad 2023-06-28 22:05:29 +02:00
Boblet
cd7b68d7ce glyphid spawn limit 2023-06-27 16:31:50 +02:00
Voxelstice
f29a9d7250
those extra 2 lines aren't useful anymore 2023-06-26 22:33:11 +03:00
Voxelstice
f9959e9a4a aaaaaaaaaaaaaaaaaa 2023-06-26 22:31:53 +03:00
Bob
7c8b8385f1 Merge remote-tracking branch 'origin/master' 2023-06-26 19:52:44 +02:00
Bob
0ac2445329 i'll fucking shoot somebody 2023-06-26 19:52:36 +02:00
Toshayo
28c43462f1
Merge remote-tracking branch 'HbmMods/master' 2023-06-26 19:25:49 +02:00
HbmMods
8a6b9d1e65
Merge pull request #1092 from Vaern/lore
Lore
2023-06-26 18:38:57 +02:00
Vaern
b853faf265 a 2023-06-26 09:38:17 -07:00
Vaern
ae88efa449 joever 2023-06-26 09:36:33 -07:00
Bob
749a65c4fe doxotron 2023-06-26 18:26:59 +02:00
Boblet
9875f5a9c2 small fixes, config options 2023-06-26 16:12:58 +02:00
Bob
ff3afbf028 ow 2023-06-25 19:10:29 +02:00
Bob
99cfce0e5d pollution effects for heavy metal and poison 2023-06-24 17:54:46 +02:00
Bob
00360a4586 memepackhunters.xxx 2023-06-23 23:06:44 +02:00
Boblet
bb15f50047 pressure requirement for recipes 2023-06-23 11:17:37 +02:00
Voxelstice
9c4c081e3e hh 2023-06-23 11:52:55 +03:00
Toshayo
39b2d394f9
Merge remote-tracking branch 'HbmMods/master' 2023-06-22 21:38:17 +02:00
Bob
ff4b231be2 more compressor stuff 2023-06-22 21:02:19 +02:00
Toshayo
5c9f78f8a2
Merge remote-tracking branch 'HbmMods/master'
# Conflicts:
#	changelog
2023-06-22 19:07:48 +02:00
Toshayo
a99dc0a464
Grenade with cats 2023-06-22 19:05:10 +02:00
Boblet
d6cdc69c89 pressure 2023-06-22 14:59:54 +02:00