2658 Commits

Author SHA1 Message Date
Bob
e46acfb19a beep beep 2023-07-01 20:26:53 +02:00
Boblet
68f9f20f5c some tweaks 2023-06-30 08:07:34 +02:00
HbmMods
7029373881
Merge pull request #1083 from Toshayo/master
Some random stuff and Sliding Blast Door
2023-06-30 07:56:18 +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
1.0.27X4641
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
HbmMods
a29e6232f4
Merge pull request #1088 from Doctor17-git/master
Updated ru_RU.lang
2023-06-25 19:27:51 +02:00
Doctor17-git
09e3a66173
Updated ru_RU.lang
updated russian localization
2023-06-25 20:22:57 +03:00
Bob
ff3afbf028 ow 2023-06-25 19:10:29 +02:00
Vaern
296af599dc lore 2023-06-24 23:55:24 -07:00
Vaern
6e2f26f7e7 Merge remote-tracking branch 'origin/master' into lore 2023-06-24 14:49:00 -07:00
HbmMods
682550616f
Merge pull request #1085 from Doctor17-git/master
Updated ru_RU.lang
2023-06-24 17:55:11 +02:00
Bob
99cfce0e5d pollution effects for heavy metal and poison 2023-06-24 17:54:46 +02:00
Doctor17-git
c32e20daf7
Updated ru_RU.lang 2023-06-24 10:14:45 +03:00
Doctor17-git
c7e428d927
Updated ru_RU.lang
updated russian localization
2023-06-24 10:12:24 +03:00
Bob
00360a4586 memepackhunters.xxx MEMEPACK-10 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
53267f2185
Idk how did this spawn 2023-06-22 19:12:51 +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
Toshayo
b736b64f7f
Updated changelog 2023-06-22 14:51:42 +02:00
Toshayo
73987a5b1c
Merge remote-tracking branch 'HbmMods/master' 2023-06-22 14:45:15 +02:00
Toshayo
eafc615fd2
Added night vision goggles 2023-06-22 14:42:30 +02:00
Toshayo
0be6b66446
Improved satellite loot system again so lunar loot is in lunar satellite and not in random class 2023-06-22 09:01:09 +02:00
Toshayo
9f873e6b76
Skin name in door skin item 2023-06-22 08:31:45 +02:00
Toshayo
c3f13a8786
Added logging of item stats re-registration end 2023-06-22 08:25:32 +02:00
Toshayo
71814dae87
Some clean-up 2023-06-21 22:45:55 +02:00
Toshayo
7d8ee8ce24
Ported Sliding Blast Door from 1.12.2 using new door API. Introduced door skins 2023-06-21 22:40:56 +02:00
Bob
ee7c10174a compressor recipes 2023-06-21 21:47:20 +02:00
Boblet
dfa5d41d05 Merge remote-tracking branch 'origin/master' 2023-06-21 13:53:26 +02:00
Boblet
6c32813bae FBI drones 2023-06-21 13:53:15 +02:00
HbmMods
8d0eaf3818
Merge pull request #1081 from Vaern/lore
book lores yipppeeeee
2023-06-21 08:48:43 +02:00
Vaern
fdb4a1c39e Whoops! 2023-06-20 23:20:58 -07:00