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 |
|
CrpBnrz
|
aa045050a1
|
QMAW localization created by me
|
2025-08-23 15:42:04 +08:00 |
|
arantirnecrolord
|
763a702ed7
|
xd
|
2025-08-20 23:55:03 +03:00 |
|
arantirnecrolord
|
a4e1cc139f
|
fuck yea
|
2025-08-20 23:40:27 +03:00 |
|
CrpBnrz
|
525169743c
|
QMAW localization from Tokiko
|
2025-08-20 21:28:56 +08:00 |
|
Bufka2011
|
e6901d8134
|
Update bakelite.json
|
2025-08-15 11:47:36 -06:00 |
|
Boblet
|
9cfdc17115
|
multidimensional time crystal
|
2025-08-14 16:20:39 +02:00 |
|