Update to new forge version

2021-02-13 10:18:48 +00:00 · 2021-01-26 11:32:42 +01:00
parent 8d0cd17a27
commit f62e762f49
314 changed files with 13724 additions and 5721 deletions
--- a/config/powah/energy/ender_cell.toml
+++ b/config/powah/energy/ender_cell.toml
@ -1,21 +1,23 @@

 [Energy_Capacity]
 	#Range: 0 ~ 9000000000000000000
-	starterCap = 0
-	#Range: 0 ~ 9000000000000000000
-	basicCap = 0
-	#Range: 0 ~ 9000000000000000000
-	hardenedCap = 0
+	spiritedCap = 0
 	#Range: 0 ~ 9000000000000000000
 	blazingCap = 0
 	#Range: 0 ~ 9000000000000000000
+	basicCap = 0
+	#Range: 0 ~ 9000000000000000000
 	nioticCap = 0
 	#Range: 0 ~ 9000000000000000000
-	spiritedCap = 0
-	#Range: 0 ~ 9000000000000000000
 	nitroCap = 0
+	#Range: 0 ~ 9000000000000000000
+	hardenedCap = 0
+	#Range: 0 ~ 9000000000000000000
+	starterCap = 0

 [Energy_Transfer]
+	#Range: 0 ~ 9000000000000000000
+	spiritedTransfer = 100000
 	#Range: 0 ~ 9000000000000000000
 	starterTransfer = 200
 	#Range: 0 ~ 9000000000000000000
@ -23,27 +25,25 @@
 	#Range: 0 ~ 9000000000000000000
 	hardenedTransfer = 8000
 	#Range: 0 ~ 9000000000000000000
-	blazingTransfer = 20000
-	#Range: 0 ~ 9000000000000000000
 	nioticTransfer = 50000
 	#Range: 0 ~ 9000000000000000000
-	spiritedTransfer = 100000
+	blazingTransfer = 20000
 	#Range: 0 ~ 9000000000000000000
 	nitroTransfer = 400000

 [Channels]
 	#Range: 1 ~ 12
-	starterChannels = 1
+	hardenedChannels = 3
 	#Range: 1 ~ 12
 	basicChannels = 2
 	#Range: 1 ~ 12
-	hardenedChannels = 3
+	spiritedChannels = 9
 	#Range: 1 ~ 12
-	blazingChannels = 5
+	starterChannels = 1
 	#Range: 1 ~ 12
 	nioticChannels = 7
 	#Range: 1 ~ 12
-	spiritedChannels = 9
+	blazingChannels = 5
 	#Range: 1 ~ 12
 	nitroChannels = 12

--- a/config/powah/energy/ender_gate.toml
+++ b/config/powah/energy/ender_gate.toml
@ -1,21 +1,23 @@

 [Energy_Capacity]
 	#Range: 0 ~ 9000000000000000000
-	starterCap = 0
-	#Range: 0 ~ 9000000000000000000
-	basicCap = 0
-	#Range: 0 ~ 9000000000000000000
-	hardenedCap = 0
+	spiritedCap = 0
 	#Range: 0 ~ 9000000000000000000
 	blazingCap = 0
 	#Range: 0 ~ 9000000000000000000
+	basicCap = 0
+	#Range: 0 ~ 9000000000000000000
 	nioticCap = 0
 	#Range: 0 ~ 9000000000000000000
-	spiritedCap = 0
-	#Range: 0 ~ 9000000000000000000
 	nitroCap = 0
+	#Range: 0 ~ 9000000000000000000
+	hardenedCap = 0
+	#Range: 0 ~ 9000000000000000000
+	starterCap = 0

 [Energy_Transfer]
+	#Range: 0 ~ 9000000000000000000
+	spiritedTransfer = 90000
 	#Range: 0 ~ 9000000000000000000
 	starterTransfer = 100
 	#Range: 0 ~ 9000000000000000000
@ -23,27 +25,25 @@
 	#Range: 0 ~ 9000000000000000000
 	hardenedTransfer = 5000
 	#Range: 0 ~ 9000000000000000000
-	blazingTransfer = 18000
-	#Range: 0 ~ 9000000000000000000
 	nioticTransfer = 40000
 	#Range: 0 ~ 9000000000000000000
-	spiritedTransfer = 90000
+	blazingTransfer = 18000
 	#Range: 0 ~ 9000000000000000000
 	nitroTransfer = 200000

 [Channels]
 	#Range: 1 ~ 12
-	starterChannels = 1
+	hardenedChannels = 3
 	#Range: 1 ~ 12
 	basicChannels = 2
 	#Range: 1 ~ 12
-	hardenedChannels = 3
+	spiritedChannels = 9
 	#Range: 1 ~ 12
-	blazingChannels = 5
+	starterChannels = 1
 	#Range: 1 ~ 12
 	nioticChannels = 7
 	#Range: 1 ~ 12
-	spiritedChannels = 9
+	blazingChannels = 5
 	#Range: 1 ~ 12
 	nitroChannels = 12

--- a/config/powah/energy/energizing.toml
+++ b/config/powah/energy/energizing.toml
@ -4,21 +4,23 @@ range = 4

 [Energy_Capacity]
 	#Range: 0 ~ 9000000000000000000
-	starterCap = 10000
-	#Range: 0 ~ 9000000000000000000
-	basicCap = 100000
-	#Range: 0 ~ 9000000000000000000
-	hardenedCap = 250000
+	spiritedCap = 4000000
 	#Range: 0 ~ 9000000000000000000
 	blazingCap = 800000
 	#Range: 0 ~ 9000000000000000000
+	basicCap = 100000
+	#Range: 0 ~ 9000000000000000000
 	nioticCap = 1500000
 	#Range: 0 ~ 9000000000000000000
-	spiritedCap = 4000000
-	#Range: 0 ~ 9000000000000000000
 	nitroCap = 10000000
+	#Range: 0 ~ 9000000000000000000
+	hardenedCap = 250000
+	#Range: 0 ~ 9000000000000000000
+	starterCap = 10000

 [Energy_Transfer]
+	#Range: 0 ~ 9000000000000000000
+	spiritedTransfer = 1200
 	#Range: 0 ~ 9000000000000000000
 	starterTransfer = 10
 	#Range: 0 ~ 9000000000000000000
@ -26,11 +28,9 @@ range = 4
 	#Range: 0 ~ 9000000000000000000
 	hardenedTransfer = 120
 	#Range: 0 ~ 9000000000000000000
-	blazingTransfer = 300
-	#Range: 0 ~ 9000000000000000000
 	nioticTransfer = 700
 	#Range: 0 ~ 9000000000000000000
-	spiritedTransfer = 1200
+	blazingTransfer = 300
 	#Range: 0 ~ 9000000000000000000
 	nitroTransfer = 3000

--- a/config/powah/energy/energy_cable.toml
+++ b/config/powah/energy/energy_cable.toml
@ -1,21 +1,23 @@

 [Energy_Capacity]
 	#Range: 0 ~ 9000000000000000000
-	starterCap = 0
-	#Range: 0 ~ 9000000000000000000
-	basicCap = 0
-	#Range: 0 ~ 9000000000000000000
-	hardenedCap = 0
+	spiritedCap = 0
 	#Range: 0 ~ 9000000000000000000
 	blazingCap = 0
 	#Range: 0 ~ 9000000000000000000
+	basicCap = 0
+	#Range: 0 ~ 9000000000000000000
 	nioticCap = 0
 	#Range: 0 ~ 9000000000000000000
-	spiritedCap = 0
-	#Range: 0 ~ 9000000000000000000
 	nitroCap = 0
+	#Range: 0 ~ 9000000000000000000
+	hardenedCap = 0
+	#Range: 0 ~ 9000000000000000000
+	starterCap = 0

 [Energy_Transfer]
+	#Range: 0 ~ 9000000000000000000
+	spiritedTransfer = 90000
 	#Range: 0 ~ 9000000000000000000
 	starterTransfer = 100
 	#Range: 0 ~ 9000000000000000000
@ -23,11 +25,9 @@
 	#Range: 0 ~ 9000000000000000000
 	hardenedTransfer = 5000
 	#Range: 0 ~ 9000000000000000000
-	blazingTransfer = 18000
-	#Range: 0 ~ 9000000000000000000
 	nioticTransfer = 40000
 	#Range: 0 ~ 9000000000000000000
-	spiritedTransfer = 90000
+	blazingTransfer = 18000
 	#Range: 0 ~ 9000000000000000000
 	nitroTransfer = 200000

--- a/config/powah/energy/energy_cell.toml
+++ b/config/powah/energy/energy_cell.toml
@ -1,21 +1,23 @@

 [Energy_Capacity]
 	#Range: 0 ~ 9000000000000000000
-	starterCap = 100000
-	#Range: 0 ~ 9000000000000000000
-	basicCap = 1000000
-	#Range: 0 ~ 9000000000000000000
-	hardenedCap = 4000000
+	spiritedCap = 60000000
 	#Range: 0 ~ 9000000000000000000
 	blazingCap = 10000000
 	#Range: 0 ~ 9000000000000000000
+	basicCap = 1000000
+	#Range: 0 ~ 9000000000000000000
 	nioticCap = 25000000
 	#Range: 0 ~ 9000000000000000000
-	spiritedCap = 60000000
-	#Range: 0 ~ 9000000000000000000
 	nitroCap = 140000000
+	#Range: 0 ~ 9000000000000000000
+	hardenedCap = 4000000
+	#Range: 0 ~ 9000000000000000000
+	starterCap = 100000

 [Energy_Transfer]
+	#Range: 0 ~ 9000000000000000000
+	spiritedTransfer = 100000
 	#Range: 0 ~ 9000000000000000000
 	starterTransfer = 200
 	#Range: 0 ~ 9000000000000000000
@ -23,11 +25,9 @@
 	#Range: 0 ~ 9000000000000000000
 	hardenedTransfer = 8000
 	#Range: 0 ~ 9000000000000000000
-	blazingTransfer = 20000
-	#Range: 0 ~ 9000000000000000000
 	nioticTransfer = 50000
 	#Range: 0 ~ 9000000000000000000
-	spiritedTransfer = 100000
+	blazingTransfer = 20000
 	#Range: 0 ~ 9000000000000000000
 	nitroTransfer = 400000

--- a/config/powah/energy/energy_discharger.toml
+++ b/config/powah/energy/energy_discharger.toml
@ -1,21 +1,23 @@

 [Energy_Capacity]
 	#Range: 0 ~ 9000000000000000000
-	starterCap = 100000
-	#Range: 0 ~ 9000000000000000000
-	basicCap = 1000000
-	#Range: 0 ~ 9000000000000000000
-	hardenedCap = 4000000
+	spiritedCap = 60000000
 	#Range: 0 ~ 9000000000000000000
 	blazingCap = 10000000
 	#Range: 0 ~ 9000000000000000000
+	basicCap = 1000000
+	#Range: 0 ~ 9000000000000000000
 	nioticCap = 25000000
 	#Range: 0 ~ 9000000000000000000
-	spiritedCap = 60000000
-	#Range: 0 ~ 9000000000000000000
 	nitroCap = 140000000
+	#Range: 0 ~ 9000000000000000000
+	hardenedCap = 4000000
+	#Range: 0 ~ 9000000000000000000
+	starterCap = 100000

 [Energy_Transfer]
+	#Range: 0 ~ 9000000000000000000
+	spiritedTransfer = 100000
 	#Range: 0 ~ 9000000000000000000
 	starterTransfer = 200
 	#Range: 0 ~ 9000000000000000000
@ -23,11 +25,9 @@
 	#Range: 0 ~ 9000000000000000000
 	hardenedTransfer = 8000
 	#Range: 0 ~ 9000000000000000000
-	blazingTransfer = 20000
-	#Range: 0 ~ 9000000000000000000
 	nioticTransfer = 50000
 	#Range: 0 ~ 9000000000000000000
-	spiritedTransfer = 100000
+	blazingTransfer = 20000
 	#Range: 0 ~ 9000000000000000000
 	nitroTransfer = 400000

--- a/config/powah/energy/energy_hopper.toml
+++ b/config/powah/energy/energy_hopper.toml
@ -1,21 +1,23 @@

 [Energy_Capacity]
 	#Range: 0 ~ 9000000000000000000
-	starterCap = 100000
-	#Range: 0 ~ 9000000000000000000
-	basicCap = 1000000
-	#Range: 0 ~ 9000000000000000000
-	hardenedCap = 3000000
+	spiritedCap = 15000000
 	#Range: 0 ~ 9000000000000000000
 	blazingCap = 5000000
 	#Range: 0 ~ 9000000000000000000
+	basicCap = 1000000
+	#Range: 0 ~ 9000000000000000000
 	nioticCap = 10000000
 	#Range: 0 ~ 9000000000000000000
-	spiritedCap = 15000000
-	#Range: 0 ~ 9000000000000000000
 	nitroCap = 40000000
+	#Range: 0 ~ 9000000000000000000
+	hardenedCap = 3000000
+	#Range: 0 ~ 9000000000000000000
+	starterCap = 100000

 [Energy_Transfer]
+	#Range: 0 ~ 9000000000000000000
+	spiritedTransfer = 100000
 	#Range: 0 ~ 9000000000000000000
 	starterTransfer = 500
 	#Range: 0 ~ 9000000000000000000
@ -23,27 +25,25 @@
 	#Range: 0 ~ 9000000000000000000
 	hardenedTransfer = 8000
 	#Range: 0 ~ 9000000000000000000
-	blazingTransfer = 20000
-	#Range: 0 ~ 9000000000000000000
 	nioticTransfer = 50000
 	#Range: 0 ~ 9000000000000000000
-	spiritedTransfer = 100000
+	blazingTransfer = 20000
 	#Range: 0 ~ 9000000000000000000
 	nitroTransfer = 400000

 [Charging_Speed]
 	#Range: 0 ~ 9000000000000000000
-	starterChargingSpeed = 100
+	nitroChargingSpeed = 50000
+	#Range: 0 ~ 9000000000000000000
+	blazingChargingSpeed = 8000
 	#Range: 0 ~ 9000000000000000000
 	basicChargingSpeed = 1000
 	#Range: 0 ~ 9000000000000000000
 	hardenedChargingSpeed = 3000
 	#Range: 0 ~ 9000000000000000000
-	blazingChargingSpeed = 8000
-	#Range: 0 ~ 9000000000000000000
 	nioticChargingSpeed = 12000
 	#Range: 0 ~ 9000000000000000000
 	spiritedChargingSpeed = 20000
 	#Range: 0 ~ 9000000000000000000
-	nitroChargingSpeed = 50000
+	starterChargingSpeed = 100

--- a/config/powah/energy/generators/furnator.toml
+++ b/config/powah/energy/generators/furnator.toml
@ -1,21 +1,23 @@

 [Energy_Capacity]
 	#Range: 0 ~ 9000000000000000000
-	starterCap = 10000
-	#Range: 0 ~ 9000000000000000000
-	basicCap = 100000
-	#Range: 0 ~ 9000000000000000000
-	hardenedCap = 500000
+	spiritedCap = 5000000
 	#Range: 0 ~ 9000000000000000000
 	blazingCap = 900000
 	#Range: 0 ~ 9000000000000000000
+	basicCap = 100000
+	#Range: 0 ~ 9000000000000000000
 	nioticCap = 2000000
 	#Range: 0 ~ 9000000000000000000
-	spiritedCap = 5000000
-	#Range: 0 ~ 9000000000000000000
 	nitroCap = 10000000
+	#Range: 0 ~ 9000000000000000000
+	hardenedCap = 500000
+	#Range: 0 ~ 9000000000000000000
+	starterCap = 10000

 [Energy_Transfer]
+	#Range: 0 ~ 9000000000000000000
+	spiritedTransfer = 7000
 	#Range: 0 ~ 9000000000000000000
 	starterTransfer = 80
 	#Range: 0 ~ 9000000000000000000
@ -23,27 +25,25 @@
 	#Range: 0 ~ 9000000000000000000
 	hardenedTransfer = 700
 	#Range: 0 ~ 9000000000000000000
-	blazingTransfer = 1200
-	#Range: 0 ~ 9000000000000000000
 	nioticTransfer = 5000
 	#Range: 0 ~ 9000000000000000000
-	spiritedTransfer = 7000
+	blazingTransfer = 1200
 	#Range: 0 ~ 9000000000000000000
 	nitroTransfer = 10000

 [Energy_Generation]
+	#Range: 0 ~ 9000000000000000000
+	blazingGeneration = 400
 	#Range: 0 ~ 9000000000000000000
 	starterGeneration = 15
 	#Range: 0 ~ 9000000000000000000
-	basicGeneration = 70
+	nitroGeneration = 4800
 	#Range: 0 ~ 9000000000000000000
 	hardenedGeneration = 180
 	#Range: 0 ~ 9000000000000000000
-	blazingGeneration = 400
-	#Range: 0 ~ 9000000000000000000
-	nioticGeneration = 900
-	#Range: 0 ~ 9000000000000000000
 	spiritedGeneration = 2000
 	#Range: 0 ~ 9000000000000000000
-	nitroGeneration = 4800
+	basicGeneration = 70
+	#Range: 0 ~ 9000000000000000000
+	nioticGeneration = 900

--- a/config/powah/energy/generators/magmator.toml
+++ b/config/powah/energy/generators/magmator.toml
@ -8,21 +8,23 @@ magmaticFluidsAPI = true

 [Energy_Capacity]
 	#Range: 0 ~ 9000000000000000000
-	starterCap = 10000
-	#Range: 0 ~ 9000000000000000000
-	basicCap = 100000
-	#Range: 0 ~ 9000000000000000000
-	hardenedCap = 500000
+	spiritedCap = 5000000
 	#Range: 0 ~ 9000000000000000000
 	blazingCap = 900000
 	#Range: 0 ~ 9000000000000000000
+	basicCap = 100000
+	#Range: 0 ~ 9000000000000000000
 	nioticCap = 2000000
 	#Range: 0 ~ 9000000000000000000
-	spiritedCap = 5000000
-	#Range: 0 ~ 9000000000000000000
 	nitroCap = 10000000
+	#Range: 0 ~ 9000000000000000000
+	hardenedCap = 500000
+	#Range: 0 ~ 9000000000000000000
+	starterCap = 10000

 [Energy_Transfer]
+	#Range: 0 ~ 9000000000000000000
+	spiritedTransfer = 7000
 	#Range: 0 ~ 9000000000000000000
 	starterTransfer = 80
 	#Range: 0 ~ 9000000000000000000
@ -30,27 +32,25 @@ magmaticFluidsAPI = true
 	#Range: 0 ~ 9000000000000000000
 	hardenedTransfer = 700
 	#Range: 0 ~ 9000000000000000000
-	blazingTransfer = 1200
-	#Range: 0 ~ 9000000000000000000
 	nioticTransfer = 5000
 	#Range: 0 ~ 9000000000000000000
-	spiritedTransfer = 7000
+	blazingTransfer = 1200
 	#Range: 0 ~ 9000000000000000000
 	nitroTransfer = 10000

 [Energy_Generation]
+	#Range: 0 ~ 9000000000000000000
+	blazingGeneration = 400
 	#Range: 0 ~ 9000000000000000000
 	starterGeneration = 15
 	#Range: 0 ~ 9000000000000000000
-	basicGeneration = 70
+	nitroGeneration = 4800
 	#Range: 0 ~ 9000000000000000000
 	hardenedGeneration = 180
 	#Range: 0 ~ 9000000000000000000
-	blazingGeneration = 400
-	#Range: 0 ~ 9000000000000000000
-	nioticGeneration = 900
-	#Range: 0 ~ 9000000000000000000
 	spiritedGeneration = 2000
 	#Range: 0 ~ 9000000000000000000
-	nitroGeneration = 4800
+	basicGeneration = 70
+	#Range: 0 ~ 9000000000000000000
+	nioticGeneration = 900

--- a/config/powah/energy/generators/reactor.toml
+++ b/config/powah/energy/generators/reactor.toml
@ -1,21 +1,23 @@

 [Energy_Capacity]
 	#Range: 0 ~ 9000000000000000000
-	starterCap = 1000000
-	#Range: 0 ~ 9000000000000000000
-	basicCap = 4000000
-	#Range: 0 ~ 9000000000000000000
-	hardenedCap = 10000000
+	spiritedCap = 50000000
 	#Range: 0 ~ 9000000000000000000
 	blazingCap = 18000000
 	#Range: 0 ~ 9000000000000000000
+	basicCap = 4000000
+	#Range: 0 ~ 9000000000000000000
 	nioticCap = 30000000
 	#Range: 0 ~ 9000000000000000000
-	spiritedCap = 50000000
-	#Range: 0 ~ 9000000000000000000
 	nitroCap = 80000000
+	#Range: 0 ~ 9000000000000000000
+	hardenedCap = 10000000
+	#Range: 0 ~ 9000000000000000000
+	starterCap = 1000000

 [Energy_Transfer]
+	#Range: 0 ~ 9000000000000000000
+	spiritedTransfer = 400000
 	#Range: 0 ~ 9000000000000000000
 	starterTransfer = 10000
 	#Range: 0 ~ 9000000000000000000
@ -23,27 +25,25 @@
 	#Range: 0 ~ 9000000000000000000
 	hardenedTransfer = 160000
 	#Range: 0 ~ 9000000000000000000
-	blazingTransfer = 100000
-	#Range: 0 ~ 9000000000000000000
 	nioticTransfer = 140000
 	#Range: 0 ~ 9000000000000000000
-	spiritedTransfer = 400000
+	blazingTransfer = 100000
 	#Range: 0 ~ 9000000000000000000
 	nitroTransfer = 800000

 [Energy_Generation]
+	#Range: 0 ~ 9000000000000000000
+	blazingGeneration = 1200
 	#Range: 0 ~ 9000000000000000000
 	starterGeneration = 100
 	#Range: 0 ~ 9000000000000000000
-	basicGeneration = 400
+	nitroGeneration = 5400
 	#Range: 0 ~ 9000000000000000000
 	hardenedGeneration = 840
 	#Range: 0 ~ 9000000000000000000
-	blazingGeneration = 1200
-	#Range: 0 ~ 9000000000000000000
-	nioticGeneration = 2700
-	#Range: 0 ~ 9000000000000000000
 	spiritedGeneration = 3800
 	#Range: 0 ~ 9000000000000000000
-	nitroGeneration = 5400
+	basicGeneration = 400
+	#Range: 0 ~ 9000000000000000000
+	nioticGeneration = 2700

--- a/config/powah/energy/generators/solar_panel.toml
+++ b/config/powah/energy/generators/solar_panel.toml
@ -1,21 +1,23 @@

 [Energy_Capacity]
 	#Range: 0 ~ 9000000000000000000
-	starterCap = 5000
-	#Range: 0 ~ 9000000000000000000
-	basicCap = 25000
-	#Range: 0 ~ 9000000000000000000
-	hardenedCap = 100000
+	spiritedCap = 2500000
 	#Range: 0 ~ 9000000000000000000
 	blazingCap = 500000
 	#Range: 0 ~ 9000000000000000000
+	basicCap = 25000
+	#Range: 0 ~ 9000000000000000000
 	nioticCap = 1000000
 	#Range: 0 ~ 9000000000000000000
-	spiritedCap = 2500000
-	#Range: 0 ~ 9000000000000000000
 	nitroCap = 8000000
+	#Range: 0 ~ 9000000000000000000
+	hardenedCap = 100000
+	#Range: 0 ~ 9000000000000000000
+	starterCap = 5000

 [Energy_Transfer]
+	#Range: 0 ~ 9000000000000000000
+	spiritedTransfer = 2000
 	#Range: 0 ~ 9000000000000000000
 	starterTransfer = 50
 	#Range: 0 ~ 9000000000000000000
@ -23,27 +25,25 @@
 	#Range: 0 ~ 9000000000000000000
 	hardenedTransfer = 300
 	#Range: 0 ~ 9000000000000000000
-	blazingTransfer = 700
-	#Range: 0 ~ 9000000000000000000
 	nioticTransfer = 1000
 	#Range: 0 ~ 9000000000000000000
-	spiritedTransfer = 2000
+	blazingTransfer = 700
 	#Range: 0 ~ 9000000000000000000
 	nitroTransfer = 4000

 [Energy_Generation]
+	#Range: 0 ~ 9000000000000000000
+	blazingGeneration = 90
 	#Range: 0 ~ 9000000000000000000
 	starterGeneration = 5
 	#Range: 0 ~ 9000000000000000000
-	basicGeneration = 12
+	nitroGeneration = 1200
 	#Range: 0 ~ 9000000000000000000
 	hardenedGeneration = 40
 	#Range: 0 ~ 9000000000000000000
-	blazingGeneration = 90
-	#Range: 0 ~ 9000000000000000000
-	nioticGeneration = 220
-	#Range: 0 ~ 9000000000000000000
 	spiritedGeneration = 500
 	#Range: 0 ~ 9000000000000000000
-	nitroGeneration = 1200
+	basicGeneration = 12
+	#Range: 0 ~ 9000000000000000000
+	nioticGeneration = 220

--- a/config/powah/energy/generators/thermo_gen.toml
+++ b/config/powah/energy/generators/thermo_gen.toml
@ -1,21 +1,23 @@

 [Energy_Capacity]
 	#Range: 0 ~ 9000000000000000000
-	starterCap = 5000
-	#Range: 0 ~ 9000000000000000000
-	basicCap = 25000
-	#Range: 0 ~ 9000000000000000000
-	hardenedCap = 100000
+	spiritedCap = 2500000
 	#Range: 0 ~ 9000000000000000000
 	blazingCap = 500000
 	#Range: 0 ~ 9000000000000000000
+	basicCap = 25000
+	#Range: 0 ~ 9000000000000000000
 	nioticCap = 1000000
 	#Range: 0 ~ 9000000000000000000
-	spiritedCap = 2500000
-	#Range: 0 ~ 9000000000000000000
 	nitroCap = 8000000
+	#Range: 0 ~ 9000000000000000000
+	hardenedCap = 100000
+	#Range: 0 ~ 9000000000000000000
+	starterCap = 5000

 [Energy_Transfer]
+	#Range: 0 ~ 9000000000000000000
+	spiritedTransfer = 2000
 	#Range: 0 ~ 9000000000000000000
 	starterTransfer = 50
 	#Range: 0 ~ 9000000000000000000
@ -23,27 +25,25 @@
 	#Range: 0 ~ 9000000000000000000
 	hardenedTransfer = 300
 	#Range: 0 ~ 9000000000000000000
-	blazingTransfer = 700
-	#Range: 0 ~ 9000000000000000000
 	nioticTransfer = 1000
 	#Range: 0 ~ 9000000000000000000
-	spiritedTransfer = 2000
+	blazingTransfer = 700
 	#Range: 0 ~ 9000000000000000000
 	nitroTransfer = 4000

 [Energy_Generation]
+	#Range: 0 ~ 9000000000000000000
+	blazingGeneration = 42
 	#Range: 0 ~ 9000000000000000000
 	starterGeneration = 3
 	#Range: 0 ~ 9000000000000000000
-	basicGeneration = 8
+	nitroGeneration = 800
 	#Range: 0 ~ 9000000000000000000
 	hardenedGeneration = 18
 	#Range: 0 ~ 9000000000000000000
-	blazingGeneration = 42
-	#Range: 0 ~ 9000000000000000000
-	nioticGeneration = 90
-	#Range: 0 ~ 9000000000000000000
 	spiritedGeneration = 200
 	#Range: 0 ~ 9000000000000000000
-	nitroGeneration = 800
+	basicGeneration = 8
+	#Range: 0 ~ 9000000000000000000
+	nioticGeneration = 90

--- a/config/powah/energy/items/battery.toml
+++ b/config/powah/energy/items/battery.toml
@ -1,21 +1,23 @@

 [Energy_Capacity]
 	#Range: 0 ~ 9000000000000000000
-	starterCap = 100000
-	#Range: 0 ~ 9000000000000000000
-	basicCap = 1000000
-	#Range: 0 ~ 9000000000000000000
-	hardenedCap = 4000000
+	spiritedCap = 60000000
 	#Range: 0 ~ 9000000000000000000
 	blazingCap = 10000000
 	#Range: 0 ~ 9000000000000000000
+	basicCap = 1000000
+	#Range: 0 ~ 9000000000000000000
 	nioticCap = 25000000
 	#Range: 0 ~ 9000000000000000000
-	spiritedCap = 60000000
-	#Range: 0 ~ 9000000000000000000
 	nitroCap = 140000000
+	#Range: 0 ~ 9000000000000000000
+	hardenedCap = 4000000
+	#Range: 0 ~ 9000000000000000000
+	starterCap = 100000

 [Energy_Transfer]
+	#Range: 0 ~ 9000000000000000000
+	spiritedTransfer = 100000
 	#Range: 0 ~ 9000000000000000000
 	starterTransfer = 200
 	#Range: 0 ~ 9000000000000000000
@ -23,11 +25,9 @@
 	#Range: 0 ~ 9000000000000000000
 	hardenedTransfer = 8000
 	#Range: 0 ~ 9000000000000000000
-	blazingTransfer = 20000
-	#Range: 0 ~ 9000000000000000000
 	nioticTransfer = 50000
 	#Range: 0 ~ 9000000000000000000
-	spiritedTransfer = 100000
+	blazingTransfer = 20000
 	#Range: 0 ~ 9000000000000000000
 	nitroTransfer = 400000

--- a/config/powah/energy/player_transmitter.toml
+++ b/config/powah/energy/player_transmitter.toml
@ -1,21 +1,23 @@

 [Energy_Capacity]
 	#Range: 0 ~ 9000000000000000000
-	starterCap = 100000
-	#Range: 0 ~ 9000000000000000000
-	basicCap = 1000000
-	#Range: 0 ~ 9000000000000000000
-	hardenedCap = 3000000
+	spiritedCap = 15000000
 	#Range: 0 ~ 9000000000000000000
 	blazingCap = 5000000
 	#Range: 0 ~ 9000000000000000000
+	basicCap = 1000000
+	#Range: 0 ~ 9000000000000000000
 	nioticCap = 10000000
 	#Range: 0 ~ 9000000000000000000
-	spiritedCap = 15000000
-	#Range: 0 ~ 9000000000000000000
 	nitroCap = 40000000
+	#Range: 0 ~ 9000000000000000000
+	hardenedCap = 3000000
+	#Range: 0 ~ 9000000000000000000
+	starterCap = 100000

 [Energy_Transfer]
+	#Range: 0 ~ 9000000000000000000
+	spiritedTransfer = 100000
 	#Range: 0 ~ 9000000000000000000
 	starterTransfer = 500
 	#Range: 0 ~ 9000000000000000000
@ -23,27 +25,25 @@
 	#Range: 0 ~ 9000000000000000000
 	hardenedTransfer = 8000
 	#Range: 0 ~ 9000000000000000000
-	blazingTransfer = 20000
-	#Range: 0 ~ 9000000000000000000
 	nioticTransfer = 50000
 	#Range: 0 ~ 9000000000000000000
-	spiritedTransfer = 100000
+	blazingTransfer = 20000
 	#Range: 0 ~ 9000000000000000000
 	nitroTransfer = 400000

 [Charging_Speed]
 	#Range: 0 ~ 9000000000000000000
-	starterChargingSpeed = 100
+	nitroChargingSpeed = 50000
+	#Range: 0 ~ 9000000000000000000
+	blazingChargingSpeed = 8000
 	#Range: 0 ~ 9000000000000000000
 	basicChargingSpeed = 1000
 	#Range: 0 ~ 9000000000000000000
 	hardenedChargingSpeed = 3000
 	#Range: 0 ~ 9000000000000000000
-	blazingChargingSpeed = 8000
-	#Range: 0 ~ 9000000000000000000
 	nioticChargingSpeed = 12000
 	#Range: 0 ~ 9000000000000000000
 	spiritedChargingSpeed = 20000
 	#Range: 0 ~ 9000000000000000000
-	nitroChargingSpeed = 50000
+	starterChargingSpeed = 100