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 |
|
Bufka2011
|
fcabf659af
|
To be translated
|
2025-08-25 13:42:17 -06:00 |
|
Bufka2011
|
742595c83f
|
I18n implementation for Meteorite Swords and Dusted Steel
|
2025-08-25 13:35:25 -06:00 |
|
Bufka2011
|
e062b4d2c3
|
More manual fixes
|
2025-08-25 13:34:06 -06:00 |
|
Bufka2011
|
a2a91d929a
|
QMAW again
|
2025-08-25 12:47:43 -06:00 |
|
Bufka2011
|
7e87efcc48
|
QMAW
|
2025-08-25 12:44:22 -06:00 |
|
Bufka2011
|
61e10fe48f
|
I'm tired of fixing
|
2025-08-25 12:25:05 -06:00 |
|
Bufka2011
|
518871bf2b
|
Polonium fix
|
2025-08-25 12:24:33 -06:00 |
|
Bufka2011
|
b75e14d9fc
|
Reader fixed
|
2025-08-25 12:11:43 -06:00 |
|
Bufka2011
|
12d2d6b8dd
|
Fixed QMAW again
|
2025-08-25 12:10:30 -06:00 |
|
Bufka2011
|
37279845be
|
Fixes
|
2025-08-25 12:02:16 -06:00 |
|
Bufka2011
|
d6b095c568
|
Fix
|
2025-08-25 11:36:31 -06:00 |
|
Bufka2011
|
f7cf05d944
|
QMAW desh fix
|
2025-08-25 11:35:20 -06:00 |
|
Bufka2011
|
3cbc342af5
|
Red copper
|
2025-08-25 11:23:12 -06:00 |
|
Bufka2011
|
ee41e9a7ed
|
QMAW fixes
|
2025-08-25 11:22:43 -06:00 |
|
Bufka2011
|
79074e19c2
|
Ferrouranium
|
2025-08-25 11:12:51 -06:00 |
|
Bufka2011
|
ad9cb55b98
|
More QMAW fixes
|
2025-08-25 11:10:35 -06:00 |
|
Bufka2011
|
d71057bbab
|
QMAW fixes
|
2025-08-25 11:08:54 -06:00 |
|
Bufka2011
|
8033fde2b9
|
Aluminium manual fix
|
2025-08-25 10:52:30 -06:00 |
|
Bufka2011
|
b209795f60
|
Rangefinder
|
2025-08-25 10:49:22 -06:00 |
|
Bufka2011
|
f73d81310a
|
Minor changes
|
2025-08-25 10:31:57 -06:00 |
|
HbmMods
|
6555d6316a
|
Merge pull request #2368 from RealSilverMoon/rbmki18n
i18n for RBMK DODD
|
2025-08-25 16:32:26 +02:00 |
|
CrpBnrz
|
4aafbdaeac
|
Merge remote-tracking branch 'origin/temp' into bob
# 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 22:06:36 +08:00 |
|
RealSilverMoon
|
4e30ac8084
|
A little distinction
|
2025-08-25 21:02:01 +08:00 |
|
Bufka2011
|
d5e923c263
|
Uhuh
|
2025-08-24 14:28:38 -06:00 |
|
Bufka2011
|
9d67211ddd
|
Fixed a joke that has been a bad joke for centuries.
|
2025-08-24 14:27:48 -06:00 |
|
Bufka2011
|
4b28ee2227
|
I18n implementation for cloth
|
2025-08-24 12:51:25 -06:00 |
|
Bufka2011
|
78ea52cbab
|
I18n implementation for ItemLemon.java
|
2025-08-24 12:37:14 -06:00 |
|
Bufka2011
|
7793f9fa24
|
More sorting
|
2025-08-24 11:09:03 -06:00 |
|
Bufka2011
|
1d18d832e7
|
Sorting
|
2025-08-24 11:02:13 -06:00 |
|
Bufka2011
|
54a5769dee
|
Minor changes
|
2025-08-23 20:10:04 -06:00 |
|
Bufka2011
|
f9369f5e02
|
Minor changes
|
2025-08-23 19:14:29 -06:00 |
|
Bufka2011
|
90522b98db
|
Destroyed?
|
2025-08-23 18:52:10 -06:00 |
|
Bufka2011
|
9e83f24179
|
Blueprint Booklet
|
2025-08-23 18:49:57 -06:00 |
|
Bufka2011
|
9a0cadaf9d
|
I18n implementation for guns
|
2025-08-23 18:10:46 -06:00 |
|
Bufka2011
|
fa6b4faeee
|
I18n for machines implementation
|
2025-08-23 17:09:19 -06:00 |
|
Bufka2011
|
fb4bca3544
|
Add files via upload
|
2025-08-23 11:13:02 -06:00 |
|
CrpBnrz
|
aa045050a1
|
QMAW localization created by me
|
2025-08-23 15:42:04 +08:00 |
|
arantirnecrolord
|
7505b72f7a
|
pipirupirupirupipi
|
2025-08-21 13:07:19 +03:00 |
|
arantirnecrolord
|
763a702ed7
|
xd
|
2025-08-20 23:55:03 +03:00 |
|
arantirnecrolord
|
a4e1cc139f
|
fuck yea
|
2025-08-20 23:40:27 +03:00 |
|
arantirnecrolord
|
ecc8151919
|
i am alive!
|
2025-08-20 23:39:07 +03:00 |
|
CrpBnrz
|
525169743c
|
QMAW localization from Tokiko
|
2025-08-20 21:28:56 +08:00 |
|
RealSilverMoon
|
e1d66c93a1
|
i18n for RBMK DODD
|
2025-08-19 16:23:56 +08:00 |
|
CrpBnrz
|
037af08963
|
Fix formatted strings
|
2025-08-19 08:15:49 +08:00 |
|
CrpBnrz
|
1a13e68c67
|
Merge remote-tracking branch 'origin/bob' into bob
|
2025-08-19 08:06:42 +08:00 |
|
CrpBnrz
|
c86aa101ba
|
Update zh_CN.lang
|
2025-08-18 22:07:50 +08:00 |
|
Bob
|
be03467f65
|
slunkus the great, lord of death
|
2025-08-17 23:09:50 +02:00 |
|
HbmMods
|
b01b88cb03
|
Merge pull request #2361 from Bufka2011/master
QMAW russian translation and ru_RU.lang update
|
2025-08-17 17:58:17 +02:00 |
|
Bob
|
bee95f9065
|
scrungus
|
2025-08-17 17:55:28 +02:00 |
|