3730 Commits

Author SHA1 Message Date
RosaTryp
8e4d4418b6 Configuration options for ashpit, leviathan turbine and all condensers 2024-08-12 13:56:45 +02:00
RosaTryp
bcdd522464 Added config options for industrial steam turbine 2024-08-12 01:26:20 +02:00
RosaTryp
b31105d4d1 Added config options to steam turbine 2024-08-12 00:55:26 +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
Bob
9ebcab3244 fixes, plushies 2024-08-05 00:47:32 +02: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
Bob
44585d3c8b baa 1.0.27_X5036 2024-07-24 13:31:25 +02: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
HbmMods
6951c73aa4
Merge pull request #1521 from 70000hp/NEI-schenanigans
NEI schenanigans
2024-07-11 08:44:58 +02:00
70000hp
7f666ecaff Fixed items with meta not working + mass storage support 2024-07-10 13:38:45 -04:00
70000hp
d4e9a5d010 Autocrafter uncluttering and drag drop support 2024-07-10 13:02:30 -04:00
70000hp
851d6fb0bf Merge branch 'master' into NEI-schenanigans 2024-07-10 12:16:45 -04:00
Boblet
ef228577d9 the heinous slop 2024-07-10 16:33:33 +02:00
70000hp
8c7b359815 all my homies hate dust 2024-07-09 12:35:01 -04:00
70000hp
1797df5ac1 Merge branch 'master' into electrolyzer-electric-boogaloo 2024-07-09 11:58:40 -04:00