Bufka2011
2b3f98a850
Merge branch 'master' of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT
...
# Conflicts:
# src/main/resources/assets/hbm/manual/material/alloy.json
# src/main/resources/assets/hbm/manual/material/aluminium.json
# src/main/resources/assets/hbm/manual/material/arsenic.json
# src/main/resources/assets/hbm/manual/material/arsenic_bronze.json
# src/main/resources/assets/hbm/manual/material/bakelite.json
# src/main/resources/assets/hbm/manual/material/bismuth.json
# src/main/resources/assets/hbm/manual/material/bismuth_bronze.json
# src/main/resources/assets/hbm/manual/material/bscco.json
# src/main/resources/assets/hbm/manual/material/cadmium.json
# src/main/resources/assets/hbm/manual/material/cadmium_steel.json
# src/main/resources/assets/hbm/manual/material/cinnabar.json
# src/main/resources/assets/hbm/manual/material/coke.json
# src/main/resources/assets/hbm/manual/material/copper.json
# src/main/resources/assets/hbm/manual/material/desh.json
# src/main/resources/assets/hbm/manual/material/ferrouranium.json
# src/main/resources/assets/hbm/manual/material/graphite.json
# src/main/resources/assets/hbm/manual/material/gunmetal.json
# src/main/resources/assets/hbm/manual/material/hss.json
# src/main/resources/assets/hbm/manual/material/latex.json
# src/main/resources/assets/hbm/manual/material/lead.json
# src/main/resources/assets/hbm/manual/material/mingrade.json
# src/main/resources/assets/hbm/manual/material/neptunium.json
# src/main/resources/assets/hbm/manual/material/plutonium-238.json
# src/main/resources/assets/hbm/manual/material/plutonium-239.json
# src/main/resources/assets/hbm/manual/material/plutonium-240.json
# src/main/resources/assets/hbm/manual/material/plutonium-241.json
# src/main/resources/assets/hbm/manual/material/plutonium-rg.json
# src/main/resources/assets/hbm/manual/material/plutonium.json
# src/main/resources/assets/hbm/manual/material/polonium.json
# src/main/resources/assets/hbm/manual/material/polymer.json
# src/main/resources/assets/hbm/manual/material/radium.json
# src/main/resources/assets/hbm/manual/material/rubber.json
# src/main/resources/assets/hbm/manual/material/silicon.json
# src/main/resources/assets/hbm/manual/material/sodium.json
# src/main/resources/assets/hbm/manual/material/steel.json
# src/main/resources/assets/hbm/manual/material/sulfur.json
# src/main/resources/assets/hbm/manual/material/tantalium.json
# src/main/resources/assets/hbm/manual/material/technetium.json
# src/main/resources/assets/hbm/manual/material/technetium_steel.json
# src/main/resources/assets/hbm/manual/material/thorium.json
# src/main/resources/assets/hbm/manual/material/uranium-233.json
# src/main/resources/assets/hbm/manual/material/uranium-235.json
# src/main/resources/assets/hbm/manual/material/uranium-238.json
# src/main/resources/assets/hbm/manual/material/uranium.json
# src/main/resources/assets/hbm/manual/material/weaponsteel.json
2025-08-25 13:56:07 -06:00
HbmMods
63d5d41d48
Merge pull request #2389 from R-Kaenbyou/new-branch-1
...
ME Storage bus compat for Arc Furnace
2025-08-25 10:04:54 +02:00
R-Kaenbyou
13b3988829
Update ContainerMachineArcFurnaceLarge.java
2025-08-23 20:42:15 -07:00
Bufka2011
fa6b4faeee
I18n for machines implementation
2025-08-23 17:09:19 -06:00
FOlkvangrField
b4b471e5c3
Fix
2025-08-20 21:46:59 +08:00
Bob
bee95f9065
scrungus
2025-08-17 17:55:28 +02:00
Bob
ba24ed64aa
pink one detected
2025-08-15 17:59:39 +02:00
Boblet
9cfdc17115
multidimensional time crystal
2025-08-14 16:20:39 +02:00
HbmMods
b5363ef039
Merge pull request #2341 from PewPewCricket/master
...
add waste barrel and vitrified waste barrel recipes to assembly machine.
2025-08-10 20:09:36 +02:00
Bob
242c4f5b03
drowned in the slop, forgotten in the slurry
2025-08-10 20:07:53 +02:00
Bob
d70464b3d1
QMAW the second (third?)
2025-08-06 20:13:44 +02:00
PewPewCricket
96f02c6a16
add yellow waste barrel and vitrified waste barrel recipes to assembly machine.
2025-08-05 14:40:46 -05:00
Bob
a5bdfa87d9
it just works
2025-08-04 20:16:50 +02:00
Bob
69b9ea9a7d
consumed by the sludge
2025-08-04 19:18:41 +02:00
Bob
737c56ed07
PUREX
2025-07-31 21:49:31 +02:00
Bob
daae2a5e32
exponsiv
2025-07-30 22:40:28 +02:00
Bob
7f887a623a
🅱️ alls
2025-07-27 17:10:39 +02:00
Bob
131e4fd42d
yesterday's shit buffet
2025-07-25 17:50:13 +02:00
Bob
2102db6229
RBMK autoloader
2025-07-24 15:12:54 +02:00
Bob
fd04024706
cast yourself a whole house, cast yourself a new mother,
...
cast a vacation straight to fucking hell
2025-07-23 16:34:11 +02:00
Bob
2f74d17823
pouring out the conk
2025-07-22 23:17:59 +02:00
Bob
05bc334274
1v1 me on twitter vro
2025-07-21 00:52:02 +02:00
Bob
b7641dcd54
now's your chance to take a [BIG SHIT]
2025-07-18 23:34:43 +02:00
Bob
f94fd70cf0
falling in love with a corporate illustration
2025-07-15 21:42:05 +02:00
Boblet
281e66b37e
my love is a quickscope
2025-07-15 16:00:43 +02:00
HbmMods
9ab3bc865b
Merge pull request #2286 from Pvndols/master
...
CCGT V3
2025-07-15 08:26:46 +02:00
Boblet
12dbb340dd
half-priced salammi
2025-07-14 16:42:54 +02:00
pvn
2cd25dbfb1
Merge branch 'HbmMods:master' into master
2025-07-14 12:41:43 +02:00
Bob
c83a53b62a
ass embluh
2025-07-13 23:27:29 +02:00
Pvndols
982e50556b
mauricio i can't move it move it anymore
...
AAAAAAAAAAAAAAAAAAAAA
2025-07-13 22:47:48 +02:00
Pvndols
dc04226713
fuck
2025-07-13 22:45:05 +02:00
Pvndols
fa6497146a
hopefully i didn't fuck up
...
CCGT changes, automode now lowers throttle when fuel low, displays fuel consumption instead of a generic power setting in the GUI, small change in GUI description, the texture now includes what should be an air filter at the tubine intake. i am NOT good at texturing.
2025-07-13 22:43:02 +02:00
Pvndols
119b8a037b
Revert "the spinniest of the fidgets"
...
This reverts commit 2841c8b67b8f459573142bbf33b1727f57159495.
2025-07-13 22:30:34 +02:00
Pvndols
e4f980e21c
Merge remote-tracking branch 'origin/master'
2025-07-13 22:23:37 +02:00
Pvndols
2841c8b67b
the spinniest of the fidgets
...
CCGT changes, automode now lowers throttle when fuel low, displays fuel consumption instead of a generic power setting in the GUI, small change in GUI description, the texture now includes what should be an air filter at the tubine intake. i am NOT good at texturing.
2025-07-13 21:05:28 +02:00
Boblet
10d8551ce3
all zinced up
2025-07-11 14:56:46 +02:00
Boblet
89100738f4
holy cungadero do i feel good
2025-07-10 16:58:37 +02:00
Boblet
9c818f45d1
scum construction machine
2025-07-09 16:56:42 +02:00
Boblet
0cf9d88e36
needle punch fuck machine
2025-07-08 16:46:41 +02:00
Boblet
6282bd028d
ough
2025-07-03 15:01:24 +02:00
Boblet
c55c8c5da1
the moon is cheese that makes you trip balls
2025-07-01 15:57:56 +02:00
Boblet
c08a90553a
FLESH
2025-06-30 16:30:59 +02:00
HbmMods
27c0c94897
Merge pull request #2241 from abel1502/abel-misc-tweaks-2
...
QoL tweaks 2
2025-06-29 10:31:48 +02:00
abel1502
b400b88701
Add flat AoE ability
2025-06-28 04:06:03 +03:00
abel1502
f820ae32e2
Fix crate locked slot
2025-06-28 04:04:02 +03:00
MerrittK
57b0cc4727
Merge branch 'HbmMods:master' into shredder_dust_fix
2025-06-25 15:16:49 -04:00
MerrittK
a982616f89
I had to reinvent the wheel because of a different config implementation.
2025-06-25 15:12:00 -04:00
Boblet
2a7033bb76
lord of the lockerroom ft. big macintosh and his massive gun
2025-06-25 15:59:05 +02:00
MerrittK
18d8fe292c
Fixed Advanced rocketry moon turf compat
2025-06-24 10:40:21 -04:00
Boblet
78c33e904d
<agony>
2025-06-23 16:58:46 +02:00
