npm - @digital4better/data - Versions diffs - 1.2.20 → 1.2.22 - Mend

@digital4better/data 1.2.20 → 1.2.22

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (65) hide show

package/data/factor/continent-monthly-green.csv +145 -145
package/data/factor/continent-monthly-green.json +1150 -1150
package/data/factor/continent-monthly.csv +146 -146
package/data/factor/continent-monthly.json +1178 -1178
package/data/factor/continent-yearly-green.csv +17 -17
package/data/factor/continent-yearly-green.json +145 -145
package/data/factor/continent-yearly.csv +18 -18
package/data/factor/continent-yearly.json +153 -153
package/data/factor/country-monthly-green.csv +1407 -1407
package/data/factor/country-monthly-green.json +10988 -10988
package/data/factor/country-monthly.csv +1517 -1517
package/data/factor/country-monthly.json +10023 -10023
package/data/factor/country-yearly-green.csv +245 -245
package/data/factor/country-yearly-green.json +1782 -1782
package/data/factor/country-yearly.csv +245 -245
package/data/factor/country-yearly.json +1657 -1657
package/data/factor/subdivision-monthly-green.csv +100 -100
package/data/factor/subdivision-monthly-green.json +900 -900
package/data/factor/subdivision-monthly.csv +100 -100
package/data/factor/subdivision-monthly.json +900 -900
package/data/factor/subdivision-yearly-green.csv +50 -50
package/data/factor/subdivision-yearly-green.json +450 -450
package/data/factor/subdivision-yearly.csv +50 -50
package/data/factor/subdivision-yearly.json +450 -450
package/data/factor/world-monthly-green.csv +75 -75
package/data/factor/world-monthly-green.json +672 -672
package/data/factor/world-monthly.csv +75 -75
package/data/factor/world-monthly.json +672 -672
package/data/factor/world-yearly-green.csv +7 -7
package/data/factor/world-yearly-green.json +63 -63
package/data/factor/world-yearly.csv +7 -7
package/data/factor/world-yearly.json +63 -63
package/data/mix/continent-monthly-green.csv +121 -121
package/data/mix/continent-monthly-green.json +292 -292
package/data/mix/continent-monthly.csv +121 -121
package/data/mix/continent-monthly.json +470 -470
package/data/mix/continent-yearly-green.csv +17 -17
package/data/mix/continent-yearly-green.json +41 -41
package/data/mix/continent-yearly.csv +17 -17
package/data/mix/continent-yearly.json +74 -74
package/data/mix/country-monthly-green.csv +949 -949
package/data/mix/country-monthly-green.json +2411 -2411
package/data/mix/country-monthly.csv +949 -949
package/data/mix/country-monthly.json +2789 -2789
package/data/mix/country-yearly-green.csv +121 -121
package/data/mix/country-yearly-green.json +266 -266
package/data/mix/country-yearly.csv +121 -121
package/data/mix/country-yearly.json +421 -421
package/data/mix/subdivision-monthly-green.csv +100 -100
package/data/mix/subdivision-monthly-green.json +360 -360
package/data/mix/subdivision-monthly.csv +100 -100
package/data/mix/subdivision-monthly.json +682 -682
package/data/mix/subdivision-yearly-green.csv +50 -50
package/data/mix/subdivision-yearly-green.json +178 -178
package/data/mix/subdivision-yearly.csv +50 -50
package/data/mix/subdivision-yearly.json +337 -337
package/data/mix/world-monthly-green.csv +75 -75
package/data/mix/world-monthly-green.json +175 -175
package/data/mix/world-monthly.csv +75 -75
package/data/mix/world-monthly.json +254 -254
package/data/mix/world-yearly-green.csv +7 -7
package/data/mix/world-yearly-green.json +16 -16
package/data/mix/world-yearly.csv +7 -7
package/data/mix/world-yearly.json +25 -25
package/package.json +7 -6

package/data/mix/country-yearly.json CHANGED Viewed

@@ -120,12 +120,12 @@
       "Nuclear": 0.041,
       "Other Fossil": 0.0233,
       "Other Renewables": 0.004,
-      "Solar": 0.0489,
+      "Solar": 0.049,
       "Wind": 0.0488
     },
     "2023": {
       "Bioenergy": 0.0164,
-      "Coal": 0.4471,
+      "Coal": 0.447,
       "Gas": 0.0778,
       "Hydro": 0.2813,
       "Nuclear": 0.0411,
@@ -136,25 +136,25 @@
     },
     "2024": {
       "Bioenergy": 0.0158,
-      "Coal": 0.4343,
-      "Gas": 0.0752,
+      "Coal": 0.4338,
+      "Gas": 0.0756,
       "Hydro": 0.2845,
-      "Nuclear": 0.0404,
+      "Nuclear": 0.0403,
       "Other Fossil": 0.0202,
       "Other Renewables": 0.0041,
-      "Solar": 0.0691,
-      "Wind": 0.0564
+      "Solar": 0.069,
+      "Wind": 0.0566
     },
     "2025": {
       "Bioenergy": 0.0167,
-      "Coal": 0.4376,
-      "Gas": 0.0757,
-      "Hydro": 0.2581,
-      "Nuclear": 0.0426,
-      "Other Fossil": 0.0213,
+      "Coal": 0.4365,
+      "Gas": 0.0768,
+      "Hydro": 0.258,
+      "Nuclear": 0.0425,
+      "Other Fossil": 0.0212,
       "Other Renewables": 0.0042,
-      "Solar": 0.0781,
-      "Wind": 0.0657
+      "Solar": 0.0775,
+      "Wind": 0.0665
     }
   },
   "AG": {
@@ -283,7 +283,7 @@
     },
     "2023": {
       "Bioenergy": 0.0088,
-      "Coal": 0.0463,
+      "Coal": 0.0462,
       "Gas": 0.0758,
       "Hydro": 0.7352,
       "Nuclear": 0.0632,
@@ -294,10 +294,10 @@
     },
     "2024": {
       "Bioenergy": 0.009,
-      "Coal": 0.0423,
+      "Coal": 0.0422,
       "Gas": 0.0716,
-      "Hydro": 0.7379,
-      "Nuclear": 0.064,
+      "Hydro": 0.738,
+      "Nuclear": 0.0641,
       "Other Fossil": 0.0064,
       "Other Renewables": 0.002,
       "Solar": 0.0264,
@@ -305,14 +305,14 @@
     },
     "2025": {
       "Bioenergy": 0.0089,
-      "Coal": 0.0468,
-      "Gas": 0.0816,
+      "Coal": 0.0466,
+      "Gas": 0.0812,
       "Hydro": 0.7305,
       "Nuclear": 0.0638,
-      "Other Fossil": 0.0069,
+      "Other Fossil": 0.0075,
       "Other Renewables": 0.002,
       "Solar": 0.0194,
-      "Wind": 0.04
+      "Wind": 0.0401
     }
   },
   "AM": {
@@ -373,7 +373,7 @@
     },
     "2024": {
       "Bioenergy": 0.0003,
-      "Coal": 0.0092,
+      "Coal": 0.0091,
       "Gas": 0.4239,
       "Hydro": 0.2249,
       "Nuclear": 0.2781,
@@ -544,7 +544,7 @@
       "Bioenergy": 0.0078,
       "Coal": 0.0039,
       "Gas": 0.5897,
-      "Hydro": 0.1881,
+      "Hydro": 0.1882,
       "Nuclear": 0.061,
       "Other Fossil": 0.0112,
       "Other Renewables": 0.0002,
@@ -678,7 +678,7 @@
     },
     "2023": {
       "Bioenergy": 0.0228,
-      "Coal": 0.0099,
+      "Coal": 0.0098,
       "Gas": 0.1131,
       "Hydro": 0.6131,
       "Nuclear": 0.0122,
@@ -699,15 +699,15 @@
       "Wind": 0.1338
     },
     "2025": {
-      "Bioenergy": 0.0343,
-      "Coal": 0.0209,
-      "Gas": 0.2501,
-      "Hydro": 0.4301,
-      "Nuclear": 0.0286,
+      "Bioenergy": 0.0338,
+      "Coal": 0.0205,
+      "Gas": 0.2467,
+      "Hydro": 0.4373,
+      "Nuclear": 0.0282,
       "Other Fossil": 0.0172,
       "Other Renewables": 0.0009,
-      "Solar": 0.0816,
-      "Wind": 0.1364
+      "Solar": 0.0806,
+      "Wind": 0.1347
     }
   },
   "AU": {
@@ -1005,25 +1005,25 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Coal": 0.6324,
+      "Coal": 0.6341,
       "Gas": 0,
-      "Hydro": 0.3324,
+      "Hydro": 0.3283,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0244,
-      "Wind": 0.0108
+      "Solar": 0.0248,
+      "Wind": 0.0128
     },
     "2025": {
       "Bioenergy": 0,
-      "Coal": 0.5954,
+      "Coal": 0.6169,
       "Gas": 0,
-      "Hydro": 0.3817,
+      "Hydro": 0.3596,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0076,
-      "Wind": 0.0153
+      "Solar": 0.0089,
+      "Wind": 0.0146
     }
   },
   "BB": {
@@ -1152,7 +1152,7 @@
     },
     "2023": {
       "Bioenergy": 0.0036,
-      "Coal": 0.2697,
+      "Coal": 0.2696,
       "Gas": 0.5054,
       "Hydro": 0.0271,
       "Nuclear": 0.0089,
@@ -1163,25 +1163,25 @@
     },
     "2024": {
       "Bioenergy": 0.0032,
-      "Coal": 0.3647,
-      "Gas": 0.4498,
+      "Coal": 0.3646,
+      "Gas": 0.4499,
       "Hydro": 0.0281,
-      "Nuclear": 0.0083,
+      "Nuclear": 0.0082,
       "Other Fossil": 0.1112,
       "Other Renewables": 0.0008,
-      "Solar": 0.0224,
+      "Solar": 0.0223,
       "Wind": 0.0115
     },
     "2025": {
       "Bioenergy": 0.0038,
-      "Coal": 0.3877,
-      "Gas": 0.4003,
+      "Coal": 0.3874,
+      "Gas": 0.4006,
       "Hydro": 0.0151,
-      "Nuclear": 0.0097,
+      "Nuclear": 0.0096,
       "Other Fossil": 0.1379,
-      "Other Renewables": 0.001,
-      "Solar": 0.0297,
-      "Wind": 0.0149
+      "Other Renewables": 0.0009,
+      "Solar": 0.0295,
+      "Wind": 0.0151
     }
   },
   "BE": {
@@ -1242,22 +1242,22 @@
     },
     "2024": {
       "Bioenergy": 0.0119,
-      "Coal": 0.0181,
-      "Gas": 0.166,
+      "Coal": 0.018,
+      "Gas": 0.1661,
       "Hydro": 0.026,
       "Nuclear": 0.3957,
       "Other Fossil": 0.0919,
       "Other Renewables": 0.0009,
       "Solar": 0.1117,
-      "Wind": 0.1778
+      "Wind": 0.1779
     },
     "2025": {
       "Bioenergy": 0.0117,
-      "Coal": 0.021,
-      "Gas": 0.2375,
+      "Coal": 0.0209,
+      "Gas": 0.2374,
       "Hydro": 0.0237,
       "Nuclear": 0.381,
-      "Other Fossil": 0.0994,
+      "Other Fossil": 0.0996,
       "Other Renewables": 0.0009,
       "Solar": 0.0837,
       "Wind": 0.1411
@@ -1886,13 +1886,13 @@
     "2025": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.661,
-      "Hydro": 0.3014,
+      "Gas": 0.6271,
+      "Hydro": 0.3322,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0274,
-      "Wind": 0.0103
+      "Solar": 0.0271,
+      "Wind": 0.0136
     }
   },
   "BR": {
@@ -1954,24 +1954,24 @@
     "2024": {
       "Bioenergy": 0.0136,
       "Coal": 0.0131,
-      "Gas": 0.0651,
+      "Gas": 0.0649,
       "Hydro": 0.6148,
       "Nuclear": 0.0226,
-      "Other Fossil": 0.0111,
+      "Other Fossil": 0.0113,
       "Other Renewables": 0,
       "Solar": 0.1076,
       "Wind": 0.1521
     },
     "2025": {
-      "Bioenergy": 0.0044,
-      "Coal": 0.0086,
-      "Gas": 0.0334,
-      "Hydro": 0.6886,
+      "Bioenergy": 0.0047,
+      "Coal": 0.0076,
+      "Gas": 0.0333,
+      "Hydro": 0.6816,
       "Nuclear": 0.022,
-      "Other Fossil": 0.0092,
+      "Other Fossil": 0.0096,
       "Other Renewables": 0,
-      "Solar": 0.1224,
-      "Wind": 0.1115
+      "Solar": 0.1263,
+      "Wind": 0.1147
     }
   },
   "BS": {
@@ -2269,7 +2269,7 @@
     },
     "2024": {
       "Bioenergy": 0.0132,
-      "Coal": 0.0011,
+      "Coal": 0.001,
       "Gas": 0.5127,
       "Hydro": 0.0102,
       "Nuclear": 0.3797,
@@ -2352,7 +2352,7 @@
       "Gas": 0.1043,
       "Hydro": 0.5107,
       "Nuclear": 0.0092,
-      "Other Fossil": 0.1038,
+      "Other Fossil": 0.1039,
       "Other Renewables": 0.0024,
       "Solar": 0.042,
       "Wind": 0.041
@@ -2360,11 +2360,11 @@
     "2025": {
       "Bioenergy": 0.1693,
       "Coal": 0.0135,
-      "Gas": 0.094,
-      "Hydro": 0.5273,
+      "Gas": 0.0939,
+      "Hydro": 0.5284,
       "Nuclear": 0.0093,
-      "Other Fossil": 0.1023,
-      "Other Renewables": 0.0024,
+      "Other Fossil": 0.1015,
+      "Other Renewables": 0.0023,
       "Solar": 0.0465,
       "Wind": 0.0353
     }
@@ -2744,7 +2744,7 @@
     "2024": {
       "Bioenergy": 0.0004,
       "Coal": 0.002,
-      "Gas": 0.0035,
+      "Gas": 0.0036,
       "Hydro": 0.5894,
       "Nuclear": 0.292,
       "Other Fossil": 0.0396,
@@ -2754,14 +2754,14 @@
     },
     "2025": {
       "Bioenergy": 0.0037,
-      "Coal": 0.0193,
-      "Gas": 0.0336,
-      "Hydro": 0.4234,
-      "Nuclear": 0.3755,
-      "Other Fossil": 0.0479,
+      "Coal": 0.0191,
+      "Gas": 0.0332,
+      "Hydro": 0.4289,
+      "Nuclear": 0.3726,
+      "Other Fossil": 0.0511,
       "Other Renewables": 0.0008,
-      "Solar": 0.0763,
-      "Wind": 0.0193
+      "Solar": 0.0714,
+      "Wind": 0.0192
     }
   },
   "CI": {
@@ -3089,7 +3089,7 @@
       "Nuclear": 0.0475,
       "Other Fossil": 0.0028,
       "Other Renewables": 0,
-      "Solar": 0.0305,
+      "Solar": 0.0306,
       "Wind": 0.0553
     },
     "2020": {
@@ -3100,7 +3100,7 @@
       "Nuclear": 0.0481,
       "Other Fossil": 0.0026,
       "Other Renewables": 0,
-      "Solar": 0.0342,
+      "Solar": 0.0343,
       "Wind": 0.0612
     },
     "2021": {
@@ -3140,23 +3140,23 @@
       "Bioenergy": 0.0195,
       "Coal": 0.5919,
       "Gas": 0.0286,
-      "Hydro": 0.1295,
+      "Hydro": 0.1294,
       "Nuclear": 0.0448,
       "Other Fossil": 0.0017,
       "Other Renewables": 0,
-      "Solar": 0.0841,
+      "Solar": 0.0842,
       "Wind": 0.1
     },
     "2025": {
-      "Bioenergy": 0.0194,
-      "Coal": 0.5911,
-      "Gas": 0.0285,
-      "Hydro": 0.092,
-      "Nuclear": 0.0465,
+      "Bioenergy": 0.0192,
+      "Coal": 0.5816,
+      "Gas": 0.0281,
+      "Hydro": 0.0926,
+      "Nuclear": 0.048,
       "Other Fossil": 0.0017,
       "Other Renewables": 0,
-      "Solar": 0.1007,
-      "Wind": 0.1201
+      "Solar": 0.1032,
+      "Wind": 0.1257
     }
   },
   "CO": {
@@ -3306,15 +3306,15 @@
       "Wind": 0.098
     },
     "2025": {
-      "Bioenergy": 0.0093,
-      "Coal": 0,
-      "Gas": 0,
-      "Hydro": 0.7283,
-      "Nuclear": 0,
-      "Other Fossil": 0,
-      "Other Renewables": 0.1019,
-      "Solar": 0,
-      "Wind": 0.1605
+      "Bioenergy": 0.0092,
+      "Coal": 0.0008,
+      "Gas": 0.0056,
+      "Hydro": 0.6823,
+      "Nuclear": 0.0006,
+      "Other Fossil": 0.0301,
+      "Other Renewables": 0.1085,
+      "Solar": 0.0021,
+      "Wind": 0.1609
     }
   },
   "CU": {
@@ -3701,15 +3701,15 @@
       "Wind": 0.2727
     },
     "2025": {
-      "Bioenergy": 0.0804,
-      "Coal": 0.2708,
-      "Gas": 0.1921,
-      "Hydro": 0.0346,
-      "Nuclear": 0.0048,
-      "Other Fossil": 0.0572,
+      "Bioenergy": 0.0786,
+      "Coal": 0.2625,
+      "Gas": 0.1874,
+      "Hydro": 0.0339,
+      "Nuclear": 0.0047,
+      "Other Fossil": 0.074,
       "Other Renewables": 0.0002,
-      "Solar": 0.1025,
-      "Wind": 0.2576
+      "Solar": 0.1027,
+      "Wind": 0.256
     }
   },
   "DJ": {
@@ -3838,7 +3838,7 @@
     },
     "2023": {
       "Bioenergy": 0.1058,
-      "Coal": 0.1052,
+      "Coal": 0.1051,
       "Gas": 0.0767,
       "Hydro": 0.0177,
       "Nuclear": 0.0199,
@@ -3860,11 +3860,11 @@
     },
     "2025": {
       "Bioenergy": 0.1374,
-      "Coal": 0.1105,
-      "Gas": 0.0925,
+      "Coal": 0.1104,
+      "Gas": 0.0923,
       "Hydro": 0.0206,
       "Nuclear": 0.0263,
-      "Other Fossil": 0.0372,
+      "Other Fossil": 0.0374,
       "Other Renewables": 0.0008,
       "Solar": 0.0644,
       "Wind": 0.5103
@@ -4175,15 +4175,15 @@
       "Wind": 0.0101
     },
     "2025": {
-      "Bioenergy": 0.0004,
-      "Coal": 0.0022,
-      "Gas": 0.0464,
-      "Hydro": 0.6314,
-      "Nuclear": 0.0015,
-      "Other Fossil": 0.3031,
-      "Other Renewables": 0.0004,
-      "Solar": 0.0057,
-      "Wind": 0.0088
+      "Bioenergy": 0.0002,
+      "Coal": 0.0012,
+      "Gas": 0.0368,
+      "Hydro": 0.6995,
+      "Nuclear": 0.0008,
+      "Other Fossil": 0.2519,
+      "Other Renewables": 0.0002,
+      "Solar": 0.0031,
+      "Wind": 0.0062
     }
   },
   "EE": {
@@ -4233,7 +4233,7 @@
     },
     "2023": {
       "Bioenergy": 0.0749,
-      "Coal": 0.0613,
+      "Coal": 0.0612,
       "Gas": 0.0994,
       "Hydro": 0.0704,
       "Nuclear": 0.0825,
@@ -4244,7 +4244,7 @@
     },
     "2024": {
       "Bioenergy": 0.0675,
-      "Coal": 0.0509,
+      "Coal": 0.0508,
       "Gas": 0.0864,
       "Hydro": 0.0657,
       "Nuclear": 0.0753,
@@ -4255,11 +4255,11 @@
     },
     "2025": {
       "Bioenergy": 0.0799,
-      "Coal": 0.0514,
-      "Gas": 0.0897,
+      "Coal": 0.0511,
+      "Gas": 0.0894,
       "Hydro": 0.0543,
       "Nuclear": 0.0698,
-      "Other Fossil": 0.358,
+      "Other Fossil": 0.3585,
       "Other Renewables": 0.0022,
       "Solar": 0.0636,
       "Wind": 0.2312
@@ -4649,15 +4649,15 @@
       "Wind": 0.2352
     },
     "2025": {
-      "Bioenergy": 0.1247,
-      "Coal": 0.0242,
-      "Gas": 0.0289,
-      "Hydro": 0.155,
-      "Nuclear": 0.3299,
-      "Other Fossil": 0.0532,
+      "Bioenergy": 0.1305,
+      "Coal": 0.0241,
+      "Gas": 0.0287,
+      "Hydro": 0.1506,
+      "Nuclear": 0.3292,
+      "Other Fossil": 0.0533,
       "Other Renewables": 0.0037,
       "Solar": 0.0083,
-      "Wind": 0.2722
+      "Wind": 0.2717
     }
   },
   "FJ": {
@@ -5103,7 +5103,7 @@
     "2023": {
       "Bioenergy": 0.0536,
       "Coal": 0.0236,
-      "Gas": 0.3517,
+      "Gas": 0.3518,
       "Hydro": 0.0279,
       "Nuclear": 0.164,
       "Other Fossil": 0.0116,
@@ -5113,9 +5113,9 @@
     },
     "2024": {
       "Bioenergy": 0.074,
-      "Coal": 0.0224,
+      "Coal": 0.0223,
       "Gas": 0.3002,
-      "Hydro": 0.0363,
+      "Hydro": 0.0364,
       "Nuclear": 0.1688,
       "Other Fossil": 0.015,
       "Other Renewables": 0.0008,
@@ -5124,13 +5124,13 @@
     },
     "2025": {
       "Bioenergy": 0.0688,
-      "Coal": 0.0156,
-      "Gas": 0.3951,
+      "Coal": 0.0155,
+      "Gas": 0.395,
       "Hydro": 0.031,
       "Nuclear": 0.1452,
-      "Other Fossil": 0.0177,
+      "Other Fossil": 0.0179,
       "Other Renewables": 0.0007,
-      "Solar": 0.0431,
+      "Solar": 0.0432,
       "Wind": 0.2827
     }
   },
@@ -5267,29 +5267,29 @@
       "Other Fossil": 0.0005,
       "Other Renewables": 0.0003,
       "Solar": 0.0032,
-      "Wind": 0.0123
+      "Wind": 0.0124
     },
     "2024": {
       "Bioenergy": 0.0016,
       "Coal": 0.0405,
       "Gas": 0.2033,
       "Hydro": 0.731,
-      "Nuclear": 0.0039,
+      "Nuclear": 0.0038,
       "Other Fossil": 0.0004,
       "Other Renewables": 0.0004,
-      "Solar": 0.0053,
+      "Solar": 0.0052,
       "Wind": 0.0136
     },
     "2025": {
       "Bioenergy": 0.0064,
-      "Coal": 0.1632,
-      "Gas": 0.3437,
+      "Coal": 0.1628,
+      "Gas": 0.3441,
       "Hydro": 0.4069,
       "Nuclear": 0.0163,
       "Other Fossil": 0.0021,
       "Other Renewables": 0.0016,
-      "Solar": 0.0264,
-      "Wind": 0.0332
+      "Solar": 0.0262,
+      "Wind": 0.0335
     }
   },
   "GF": {
@@ -5995,7 +5995,7 @@
       "Bioenergy": 0.0003,
       "Coal": 0.0876,
       "Gas": 0.47,
-      "Hydro": 0.0407,
+      "Hydro": 0.0406,
       "Nuclear": 0.0018,
       "Other Fossil": 0.0002,
       "Other Renewables": 0.0001,
@@ -6361,7 +6361,7 @@
       "Nuclear": 0.0134,
       "Other Fossil": 0.0062,
       "Other Renewables": 0.0013,
-      "Solar": 0.0132,
+      "Solar": 0.0133,
       "Wind": 0.0159
     },
     "2023": {
@@ -6377,10 +6377,10 @@
     },
     "2024": {
       "Bioenergy": 0.008,
-      "Coal": 0.5643,
-      "Gas": 0.3396,
+      "Coal": 0.5642,
+      "Gas": 0.3397,
       "Hydro": 0.0303,
-      "Nuclear": 0.0132,
+      "Nuclear": 0.0131,
       "Other Fossil": 0.0051,
       "Other Renewables": 0.0013,
       "Solar": 0.0198,
@@ -6388,14 +6388,14 @@
     },
     "2025": {
       "Bioenergy": 0.0083,
-      "Coal": 0.5654,
-      "Gas": 0.3397,
+      "Coal": 0.5651,
+      "Gas": 0.3401,
       "Hydro": 0.0217,
       "Nuclear": 0.0139,
       "Other Fossil": 0.0055,
       "Other Renewables": 0.0014,
-      "Solar": 0.0227,
-      "Wind": 0.0214
+      "Solar": 0.0225,
+      "Wind": 0.0217
     }
   },
   "HN": {
@@ -6535,22 +6535,22 @@
     },
     "2024": {
       "Bioenergy": 0.04,
-      "Coal": 0.0745,
-      "Gas": 0.2145,
+      "Coal": 0.0743,
+      "Gas": 0.2146,
       "Hydro": 0.3472,
       "Nuclear": 0.0543,
       "Other Fossil": 0.0098,
       "Other Renewables": 0.0163,
       "Solar": 0.0702,
-      "Wind": 0.1733
+      "Wind": 0.1734
     },
     "2025": {
       "Bioenergy": 0.038,
-      "Coal": 0.0344,
-      "Gas": 0.2406,
+      "Coal": 0.0343,
+      "Gas": 0.2405,
       "Hydro": 0.3511,
       "Nuclear": 0.046,
-      "Other Fossil": 0.0113,
+      "Other Fossil": 0.0115,
       "Other Renewables": 0.0141,
       "Solar": 0.0509,
       "Wind": 0.2136
@@ -6682,7 +6682,7 @@
     },
     "2023": {
       "Bioenergy": 0.0239,
-      "Coal": 0.0985,
+      "Coal": 0.0984,
       "Gas": 0.2079,
       "Hydro": 0.0475,
       "Nuclear": 0.3887,
@@ -6693,7 +6693,7 @@
     },
     "2024": {
       "Bioenergy": 0.0265,
-      "Coal": 0.0881,
+      "Coal": 0.088,
       "Gas": 0.1911,
       "Hydro": 0.0455,
       "Nuclear": 0.3711,
@@ -6703,15 +6703,15 @@
       "Wind": 0.0448
     },
     "2025": {
-      "Bioenergy": 0.0394,
-      "Coal": 0.0762,
-      "Gas": 0.2635,
-      "Hydro": 0.0456,
-      "Nuclear": 0.3625,
-      "Other Fossil": 0.0177,
+      "Bioenergy": 0.0401,
+      "Coal": 0.0773,
+      "Gas": 0.268,
+      "Hydro": 0.0464,
+      "Nuclear": 0.369,
+      "Other Fossil": 0.0184,
       "Other Renewables": 0.0041,
-      "Solar": 0.1453,
-      "Wind": 0.0459
+      "Solar": 0.13,
+      "Wind": 0.0468
     }
   },
   "ID": {
@@ -6851,7 +6851,7 @@
     },
     "2024": {
       "Bioenergy": 0.0079,
-      "Coal": 0.0487,
+      "Coal": 0.0486,
       "Gas": 0.4406,
       "Hydro": 0.0501,
       "Nuclear": 0.0319,
@@ -6862,14 +6862,14 @@
     },
     "2025": {
       "Bioenergy": 0.0069,
-      "Coal": 0.0355,
-      "Gas": 0.4034,
+      "Coal": 0.0354,
+      "Gas": 0.4032,
       "Hydro": 0.0493,
       "Nuclear": 0.0271,
-      "Other Fossil": 0.0342,
+      "Other Fossil": 0.0344,
       "Other Renewables": 0.0009,
       "Solar": 0.0134,
-      "Wind": 0.4294
+      "Wind": 0.4295
     }
   },
   "IL": {
@@ -7179,10 +7179,10 @@
     "2025": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.6644,
-      "Hydro": 0.0186,
+      "Gas": 0.6444,
+      "Hydro": 0.0287,
       "Nuclear": 0,
-      "Other Fossil": 0.317,
+      "Other Fossil": 0.3269,
       "Other Renewables": 0,
       "Solar": 0,
       "Wind": 0
@@ -7321,11 +7321,11 @@
       "Other Fossil": 0.033,
       "Other Renewables": 0.0193,
       "Solar": 0.1142,
-      "Wind": 0.1015
+      "Wind": 0.1016
     },
     "2024": {
       "Bioenergy": 0.0554,
-      "Coal": 0.0351,
+      "Coal": 0.035,
       "Gas": 0.408,
       "Hydro": 0.1861,
       "Nuclear": 0.0346,
@@ -7336,14 +7336,14 @@
     },
     "2025": {
       "Bioenergy": 0.0544,
-      "Coal": 0.0406,
-      "Gas": 0.5032,
+      "Coal": 0.0404,
+      "Gas": 0.5031,
       "Hydro": 0.1124,
       "Nuclear": 0.0354,
-      "Other Fossil": 0.0298,
+      "Other Fossil": 0.0301,
       "Other Renewables": 0.019,
       "Solar": 0.0767,
-      "Wind": 0.1284
+      "Wind": 0.1285
     }
   },
   "JM": {
@@ -7721,7 +7721,7 @@
     "2024": {
       "Bioenergy": 0.0019,
       "Coal": 0.1306,
-      "Gas": 0.0168,
+      "Gas": 0.0169,
       "Hydro": 0.8151,
       "Nuclear": 0.0047,
       "Other Fossil": 0.017,
@@ -7731,14 +7731,14 @@
     },
     "2025": {
       "Bioenergy": 0.0016,
-      "Coal": 0.0997,
-      "Gas": 0.0157,
+      "Coal": 0.0996,
+      "Gas": 0.0158,
       "Hydro": 0.8398,
       "Nuclear": 0.0041,
       "Other Fossil": 0.0255,
       "Other Renewables": 0.0004,
-      "Solar": 0.0067,
-      "Wind": 0.0064
+      "Solar": 0.0066,
+      "Wind": 0.0065
     }
   },
   "KH": {
@@ -7794,30 +7794,30 @@
       "Nuclear": 0.0135,
       "Other Fossil": 0.0555,
       "Other Renewables": 0.0013,
-      "Solar": 0.0256,
+      "Solar": 0.0255,
       "Wind": 0.0177
     },
     "2024": {
       "Bioenergy": 0.0135,
-      "Coal": 0.4631,
-      "Gas": 0.0247,
+      "Coal": 0.463,
+      "Gas": 0.0248,
       "Hydro": 0.3809,
-      "Nuclear": 0.0133,
+      "Nuclear": 0.0132,
       "Other Fossil": 0.0552,
       "Other Renewables": 0.0013,
       "Solar": 0.0295,
-      "Wind": 0.0185
+      "Wind": 0.0186
     },
     "2025": {
       "Bioenergy": 0.0138,
-      "Coal": 0.4642,
-      "Gas": 0.0248,
+      "Coal": 0.4639,
+      "Gas": 0.0252,
       "Hydro": 0.3722,
       "Nuclear": 0.014,
-      "Other Fossil": 0.0556,
+      "Other Fossil": 0.0555,
       "Other Renewables": 0.0014,
-      "Solar": 0.0325,
-      "Wind": 0.0216
+      "Solar": 0.0323,
+      "Wind": 0.0218
     }
   },
   "KI": {
@@ -8204,15 +8204,15 @@
       "Wind": 0.0057
     },
     "2025": {
-      "Bioenergy": 0.0209,
-      "Coal": 0.2538,
-      "Gas": 0.3038,
-      "Hydro": 0.0043,
-      "Nuclear": 0.3458,
-      "Other Fossil": 0.0077,
+      "Bioenergy": 0.0206,
+      "Coal": 0.2404,
+      "Gas": 0.3112,
+      "Hydro": 0.004,
+      "Nuclear": 0.3388,
+      "Other Fossil": 0.008,
       "Other Renewables": 0.0147,
-      "Solar": 0.0412,
-      "Wind": 0.0079
+      "Solar": 0.0527,
+      "Wind": 0.0096
     }
   },
   "KW": {
@@ -8973,9 +8973,9 @@
     },
     "2023": {
       "Bioenergy": 0.0386,
-      "Coal": 0.0891,
+      "Coal": 0.0889,
       "Gas": 0.195,
-      "Hydro": 0.1349,
+      "Hydro": 0.135,
       "Nuclear": 0.1202,
       "Other Fossil": 0.0574,
       "Other Renewables": 0.0039,
@@ -8984,22 +8984,22 @@
     },
     "2024": {
       "Bioenergy": 0.0307,
-      "Coal": 0.0609,
+      "Coal": 0.0607,
       "Gas": 0.1656,
-      "Hydro": 0.1098,
+      "Hydro": 0.1099,
       "Nuclear": 0.0913,
       "Other Fossil": 0.0841,
       "Other Renewables": 0.0029,
-      "Solar": 0.1399,
+      "Solar": 0.14,
       "Wind": 0.3148
     },
     "2025": {
       "Bioenergy": 0.0243,
-      "Coal": 0.0505,
-      "Gas": 0.2596,
+      "Coal": 0.0503,
+      "Gas": 0.2593,
       "Hydro": 0.0767,
       "Nuclear": 0.0678,
-      "Other Fossil": 0.108,
+      "Other Fossil": 0.1083,
       "Other Renewables": 0.0021,
       "Solar": 0.0667,
       "Wind": 0.3443
@@ -9041,7 +9041,7 @@
     },
     "2022": {
       "Bioenergy": 0.0844,
-      "Coal": 0.1281,
+      "Coal": 0.1282,
       "Gas": 0.2268,
       "Hydro": 0.1306,
       "Nuclear": 0.1501,
@@ -9052,9 +9052,9 @@
     },
     "2023": {
       "Bioenergy": 0.0551,
-      "Coal": 0.111,
-      "Gas": 0.198,
-      "Hydro": 0.1442,
+      "Coal": 0.1108,
+      "Gas": 0.1981,
+      "Hydro": 0.1443,
       "Nuclear": 0.1506,
       "Other Fossil": 0.0366,
       "Other Renewables": 0.0049,
@@ -9063,25 +9063,25 @@
     },
     "2024": {
       "Bioenergy": 0.0735,
-      "Coal": 0.0985,
-      "Gas": 0.181,
-      "Hydro": 0.1558,
-      "Nuclear": 0.1479,
+      "Coal": 0.0982,
+      "Gas": 0.1811,
+      "Hydro": 0.1559,
+      "Nuclear": 0.148,
       "Other Fossil": 0.0371,
       "Other Renewables": 0.0047,
       "Solar": 0.1157,
-      "Wind": 0.1857
+      "Wind": 0.1858
     },
     "2025": {
       "Bioenergy": 0.0742,
-      "Coal": 0.1112,
-      "Gas": 0.2165,
+      "Coal": 0.1106,
+      "Gas": 0.2158,
       "Hydro": 0.1406,
-      "Nuclear": 0.1512,
-      "Other Fossil": 0.0391,
+      "Nuclear": 0.1511,
+      "Other Fossil": 0.0403,
       "Other Renewables": 0.0048,
       "Solar": 0.0842,
-      "Wind": 0.1783
+      "Wind": 0.1784
     }
   },
   "LV": {
@@ -9120,9 +9120,9 @@
     },
     "2022": {
       "Bioenergy": 0.058,
-      "Coal": 0.0584,
+      "Coal": 0.0585,
       "Gas": 0.2505,
-      "Hydro": 0.4327,
+      "Hydro": 0.4326,
       "Nuclear": 0.0677,
       "Other Fossil": 0.0448,
       "Other Renewables": 0.0023,
@@ -9142,25 +9142,25 @@
     },
     "2024": {
       "Bioenergy": 0.0543,
-      "Coal": 0.0392,
-      "Gas": 0.2658,
+      "Coal": 0.0391,
+      "Gas": 0.2659,
       "Hydro": 0.4251,
       "Nuclear": 0.0587,
       "Other Fossil": 0.0103,
       "Other Renewables": 0.0019,
       "Solar": 0.0774,
-      "Wind": 0.0674
+      "Wind": 0.0675
     },
     "2025": {
-      "Bioenergy": 0.0523,
-      "Coal": 0.0077,
-      "Gas": 0.4014,
-      "Hydro": 0.4429,
-      "Nuclear": 0.011,
-      "Other Fossil": 0.0119,
+      "Bioenergy": 0.052,
+      "Coal": 0.0076,
+      "Gas": 0.3991,
+      "Hydro": 0.4405,
+      "Nuclear": 0.0109,
+      "Other Fossil": 0.012,
       "Other Renewables": 0.0003,
-      "Solar": 0.0341,
-      "Wind": 0.0385
+      "Solar": 0.0392,
+      "Wind": 0.0383
     }
   },
   "LY": {
@@ -9299,26 +9299,26 @@
       "Wind": 0.16
     },
     "2024": {
-      "Bioenergy": 0.0003,
-      "Coal": 0.5699,
-      "Gas": 0.1133,
-      "Hydro": 0.0258,
-      "Nuclear": 0.001,
-      "Other Fossil": 0.0224,
+      "Bioenergy": 0.0002,
+      "Coal": 0.5842,
+      "Gas": 0.1107,
+      "Hydro": 0.0257,
+      "Nuclear": 0.0009,
+      "Other Fossil": 0.0219,
       "Other Renewables": 0.0004,
-      "Solar": 0.0411,
-      "Wind": 0.2257
+      "Solar": 0.0389,
+      "Wind": 0.2171
     },
     "2025": {
-      "Bioenergy": 0.0003,
-      "Coal": 0.5767,
-      "Gas": 0.1265,
-      "Hydro": 0.027,
-      "Nuclear": 0.0013,
-      "Other Fossil": 0.0242,
-      "Other Renewables": 0.0005,
-      "Solar": 0.0361,
-      "Wind": 0.2073
+      "Bioenergy": 0,
+      "Coal": 0.6601,
+      "Gas": 0.0935,
+      "Hydro": 0.0198,
+      "Nuclear": 0,
+      "Other Fossil": 0.0198,
+      "Other Renewables": 0,
+      "Solar": 0.0227,
+      "Wind": 0.1841
     }
   },
   "MD": {
@@ -9391,7 +9391,7 @@
     "2025": {
       "Bioenergy": 0.0006,
       "Coal": 0.0031,
-      "Gas": 0.9221,
+      "Gas": 0.922,
       "Hydro": 0.045,
       "Nuclear": 0.0042,
       "Other Fossil": 0.0005,
@@ -9458,25 +9458,25 @@
     },
     "2024": {
       "Bioenergy": 0.0039,
-      "Coal": 0.3768,
+      "Coal": 0.3767,
       "Gas": 0.0311,
       "Hydro": 0.4323,
       "Nuclear": 0.0289,
       "Other Fossil": 0.0029,
       "Other Renewables": 0.0009,
-      "Solar": 0.0316,
+      "Solar": 0.0317,
       "Wind": 0.0916
     },
     "2025": {
       "Bioenergy": 0.0037,
-      "Coal": 0.3896,
-      "Gas": 0.0336,
+      "Coal": 0.3895,
+      "Gas": 0.0334,
       "Hydro": 0.437,
       "Nuclear": 0.0261,
-      "Other Fossil": 0.0028,
+      "Other Fossil": 0.003,
       "Other Renewables": 0.0008,
       "Solar": 0.0066,
-      "Wind": 0.0997
+      "Wind": 0.0998
     }
   },
   "MG": {
@@ -9622,19 +9622,19 @@
       "Nuclear": 0.0183,
       "Other Fossil": 0.0019,
       "Other Renewables": 0.0006,
-      "Solar": 0.05,
+      "Solar": 0.0501,
       "Wind": 0.0428
     },
     "2025": {
       "Bioenergy": 0.0193,
-      "Coal": 0.3167,
-      "Gas": 0.2779,
+      "Coal": 0.3165,
+      "Gas": 0.2777,
       "Hydro": 0.2273,
       "Nuclear": 0.0556,
-      "Other Fossil": 0.006,
+      "Other Fossil": 0.0065,
       "Other Renewables": 0.0018,
       "Solar": 0.0376,
-      "Wind": 0.0578
+      "Wind": 0.0579
     }
   },
   "ML": {
@@ -9864,14 +9864,14 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Coal": 0.9198,
+      "Coal": 0.917,
       "Gas": 0,
       "Hydro": 0,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
       "Solar": 0,
-      "Wind": 0.0802
+      "Wind": 0.083
     }
   },
   "MO": {
@@ -9921,36 +9921,36 @@
     },
     "2023": {
       "Bioenergy": 0.056,
-      "Coal": 0.4824,
+      "Coal": 0.4823,
       "Gas": 0.1637,
       "Hydro": 0.0997,
-      "Nuclear": 0.0456,
+      "Nuclear": 0.0457,
       "Other Fossil": 0.0354,
       "Other Renewables": 0.0044,
-      "Solar": 0.0529,
-      "Wind": 0.0599
+      "Solar": 0.0528,
+      "Wind": 0.06
     },
     "2024": {
       "Bioenergy": 0.0554,
-      "Coal": 0.4682,
-      "Gas": 0.1608,
+      "Coal": 0.4676,
+      "Gas": 0.1613,
       "Hydro": 0.1032,
-      "Nuclear": 0.0449,
+      "Nuclear": 0.0448,
       "Other Fossil": 0.0342,
       "Other Renewables": 0.0045,
-      "Solar": 0.0663,
-      "Wind": 0.0626
+      "Solar": 0.0662,
+      "Wind": 0.0629
     },
     "2025": {
       "Bioenergy": 0.0564,
-      "Coal": 0.4718,
-      "Gas": 0.1613,
-      "Hydro": 0.0739,
-      "Nuclear": 0.0473,
-      "Other Fossil": 0.0354,
-      "Other Renewables": 0.0047,
-      "Solar": 0.0763,
-      "Wind": 0.0729
+      "Coal": 0.4706,
+      "Gas": 0.1626,
+      "Hydro": 0.0738,
+      "Nuclear": 0.0472,
+      "Other Fossil": 0.0353,
+      "Other Renewables": 0.0046,
+      "Solar": 0.0756,
+      "Wind": 0.0738
     }
   },
   "MQ": {
@@ -10237,36 +10237,36 @@
     },
     "2023": {
       "Bioenergy": 0.0043,
-      "Coal": 0.0228,
+      "Coal": 0.0227,
       "Gas": 0.7654,
       "Hydro": 0.0265,
       "Nuclear": 0.0311,
       "Other Fossil": 0.008,
       "Other Renewables": 0.001,
       "Solar": 0.121,
-      "Wind": 0.0199
+      "Wind": 0.02
     },
     "2024": {
       "Bioenergy": 0.0064,
-      "Coal": 0.0302,
+      "Coal": 0.0301,
       "Gas": 0.7037,
-      "Hydro": 0.0406,
-      "Nuclear": 0.0461,
+      "Hydro": 0.0407,
+      "Nuclear": 0.0462,
       "Other Fossil": 0.0069,
       "Other Renewables": 0.0015,
       "Solar": 0.1364,
       "Wind": 0.0282
     },
     "2025": {
-      "Bioenergy": 0.0068,
-      "Coal": 0.0358,
-      "Gas": 0.7594,
-      "Hydro": 0.0381,
-      "Nuclear": 0.0489,
-      "Other Fossil": 0.0053,
+      "Bioenergy": 0.0066,
+      "Coal": 0.0342,
+      "Gas": 0.7264,
+      "Hydro": 0.0365,
+      "Nuclear": 0.0469,
+      "Other Fossil": 0.0155,
       "Other Renewables": 0.0015,
-      "Solar": 0.0735,
-      "Wind": 0.0306
+      "Solar": 0.1028,
+      "Wind": 0.0297
     }
   },
   "MU": {
@@ -11130,9 +11130,9 @@
       "Bioenergy": 0.1682,
       "Coal": 0.0027,
       "Gas": 0.0191,
-      "Hydro": 0.0876,
+      "Hydro": 0.0878,
       "Nuclear": 0.0019,
-      "Other Fossil": 0.3982,
+      "Other Fossil": 0.398,
       "Other Renewables": 0.1562,
       "Solar": 0.0132,
       "Wind": 0.1529
@@ -11354,25 +11354,25 @@
     },
     "2024": {
       "Bioenergy": 0.0043,
-      "Coal": 0.1141,
-      "Gas": 0.0203,
+      "Coal": 0.1139,
+      "Gas": 0.0205,
       "Hydro": 0.8051,
       "Nuclear": 0.0109,
       "Other Fossil": 0.0012,
       "Other Renewables": 0.0011,
       "Solar": 0.0264,
-      "Wind": 0.0165
+      "Wind": 0.0166
     },
     "2025": {
       "Bioenergy": 0.0045,
-      "Coal": 0.115,
-      "Gas": 0.0205,
+      "Coal": 0.1147,
+      "Gas": 0.0208,
       "Hydro": 0.7979,
       "Nuclear": 0.0115,
       "Other Fossil": 0.0015,
       "Other Renewables": 0.0011,
-      "Solar": 0.0289,
-      "Wind": 0.019
+      "Solar": 0.0287,
+      "Wind": 0.0193
     }
   },
   "NR": {
@@ -11602,14 +11602,14 @@
     },
     "2025": {
       "Bioenergy": 0.0011,
-      "Coal": 0.0419,
-      "Gas": 0.1235,
-      "Hydro": 0.5336,
+      "Coal": 0.0474,
+      "Gas": 0.1283,
+      "Hydro": 0.5129,
       "Nuclear": 0,
       "Other Fossil": 0,
-      "Other Renewables": 0.2315,
+      "Other Renewables": 0.2349,
       "Solar": 0,
-      "Wind": 0.0684
+      "Wind": 0.0754
     }
   },
   "OM": {
@@ -11838,15 +11838,15 @@
       "Wind": 0.0651
     },
     "2025": {
-      "Bioenergy": 0.0067,
+      "Bioenergy": 0.0058,
       "Coal": 0,
-      "Gas": 0.2881,
-      "Hydro": 0.636,
+      "Gas": 0.2941,
+      "Hydro": 0.6226,
       "Nuclear": 0,
       "Other Fossil": 0.002,
       "Other Renewables": 0,
-      "Solar": 0.0201,
-      "Wind": 0.047
+      "Solar": 0.0208,
+      "Wind": 0.0547
     }
   },
   "PF": {
@@ -12517,7 +12517,7 @@
     },
     "2022": {
       "Bioenergy": 0.0707,
-      "Coal": 0.0318,
+      "Coal": 0.0319,
       "Gas": 0.3732,
       "Hydro": 0.1348,
       "Nuclear": 0.038,
@@ -12528,7 +12528,7 @@
     },
     "2023": {
       "Bioenergy": 0.0634,
-      "Coal": 0.0292,
+      "Coal": 0.0291,
       "Gas": 0.2464,
       "Hydro": 0.2323,
       "Nuclear": 0.042,
@@ -12539,7 +12539,7 @@
     },
     "2024": {
       "Bioenergy": 0.0664,
-      "Coal": 0.0289,
+      "Coal": 0.0288,
       "Gas": 0.1455,
       "Hydro": 0.273,
       "Nuclear": 0.0445,
@@ -12550,11 +12550,11 @@
     },
     "2025": {
       "Bioenergy": 0.0529,
-      "Coal": 0.0119,
+      "Coal": 0.0118,
       "Gas": 0.1442,
       "Hydro": 0.3644,
       "Nuclear": 0.016,
-      "Other Fossil": 0.0054,
+      "Other Fossil": 0.0055,
       "Other Renewables": 0.0005,
       "Solar": 0.085,
       "Wind": 0.3196
@@ -12855,7 +12855,7 @@
     },
     "2024": {
       "Bioenergy": 0.0096,
-      "Coal": 0.1313,
+      "Coal": 0.1312,
       "Gas": 0.1951,
       "Hydro": 0.2618,
       "Nuclear": 0.2036,
@@ -12867,7 +12867,7 @@
     "2025": {
       "Bioenergy": 0.0118,
       "Coal": 0.1466,
-      "Gas": 0.2351,
+      "Gas": 0.235,
       "Hydro": 0.2057,
       "Nuclear": 0.2111,
       "Other Fossil": 0.002,
@@ -12945,7 +12945,7 @@
     },
     "2025": {
       "Bioenergy": 0.0074,
-      "Coal": 0.6211,
+      "Coal": 0.621,
       "Gas": 0.0666,
       "Hydro": 0.2543,
       "Nuclear": 0.0019,
@@ -13566,25 +13566,25 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Coal": 0,
-      "Gas": 0.9563,
+      "Coal": 0.0002,
+      "Gas": 0.9557,
       "Hydro": 0,
       "Nuclear": 0,
       "Other Fossil": 0.0225,
       "Other Renewables": 0,
-      "Solar": 0.0211,
+      "Solar": 0.0215,
       "Wind": 0
     },
     "2025": {
-      "Bioenergy": 0,
-      "Coal": 0,
-      "Gas": 0.9609,
-      "Hydro": 0,
-      "Nuclear": 0,
-      "Other Fossil": 0.0206,
+      "Bioenergy": 0.0001,
+      "Coal": 0.0022,
+      "Gas": 0.9539,
+      "Hydro": 0.0003,
+      "Nuclear": 0.0002,
+      "Other Fossil": 0.0202,
       "Other Renewables": 0,
-      "Solar": 0.0185,
-      "Wind": 0
+      "Solar": 0.0226,
+      "Wind": 0.0003
     }
   },
   "SH": {
@@ -13724,7 +13724,7 @@
     },
     "2024": {
       "Bioenergy": 0.0081,
-      "Coal": 0.2056,
+      "Coal": 0.2055,
       "Gas": 0.0344,
       "Hydro": 0.3229,
       "Nuclear": 0.3497,
@@ -14830,25 +14830,25 @@
     },
     "2024": {
       "Bioenergy": 0.0609,
-      "Coal": 0.222,
-      "Gas": 0.5978,
-      "Hydro": 0.0458,
+      "Coal": 0.2219,
+      "Gas": 0.5979,
+      "Hydro": 0.0457,
       "Nuclear": 0.0076,
-      "Other Fossil": 0.002,
+      "Other Fossil": 0.0019,
       "Other Renewables": 0.0008,
       "Solar": 0.0366,
-      "Wind": 0.0267
+      "Wind": 0.0268
     },
     "2025": {
       "Bioenergy": 0.0853,
-      "Coal": 0.2059,
-      "Gas": 0.5662,
+      "Coal": 0.2057,
+      "Gas": 0.5664,
       "Hydro": 0.0605,
       "Nuclear": 0.0082,
       "Other Fossil": 0.0011,
       "Other Renewables": 0.0008,
-      "Solar": 0.0404,
-      "Wind": 0.0314
+      "Solar": 0.0403,
+      "Wind": 0.0316
     }
   },
   "TJ": {
@@ -15314,15 +15314,15 @@
       "Wind": 0.107
     },
     "2025": {
-      "Bioenergy": 0.025,
-      "Coal": 0.3494,
-      "Gas": 0.2429,
-      "Hydro": 0.1662,
+      "Bioenergy": 0.0249,
+      "Coal": 0.3487,
+      "Gas": 0.2424,
+      "Hydro": 0.1659,
       "Nuclear": 0.0002,
-      "Other Fossil": 0.0027,
-      "Other Renewables": 0.0335,
-      "Solar": 0.0718,
-      "Wind": 0.1083
+      "Other Fossil": 0.0028,
+      "Other Renewables": 0.0334,
+      "Solar": 0.0735,
+      "Wind": 0.1082
     }
   },
   "TT": {
@@ -15407,10 +15407,10 @@
   "TW": {
     "2019": {
       "Bioenergy": 0.0007,
-      "Coal": 0.4665,
+      "Coal": 0.4664,
       "Gas": 0.3363,
       "Hydro": 0.0205,
-      "Nuclear": 0.1192,
+      "Nuclear": 0.1193,
       "Other Fossil": 0.035,
       "Other Renewables": 0,
       "Solar": 0.0148,
@@ -15419,7 +15419,7 @@
     "2020": {
       "Bioenergy": 0.0008,
       "Coal": 0.4548,
-      "Gas": 0.3607,
+      "Gas": 0.3608,
       "Hydro": 0.0109,
       "Nuclear": 0.1136,
       "Other Fossil": 0.0289,
@@ -15440,47 +15440,47 @@
     },
     "2022": {
       "Bioenergy": 0.0007,
-      "Coal": 0.4246,
-      "Gas": 0.3929,
+      "Coal": 0.4245,
+      "Gas": 0.3928,
       "Hydro": 0.0205,
       "Nuclear": 0.0833,
       "Other Fossil": 0.0283,
       "Other Renewables": 0,
       "Solar": 0.0374,
-      "Wind": 0.0124
+      "Wind": 0.0125
     },
     "2023": {
-      "Bioenergy": 0.0007,
-      "Coal": 0.4429,
-      "Gas": 0.3929,
-      "Hydro": 0.0166,
-      "Nuclear": 0.0617,
-      "Other Fossil": 0.0262,
+      "Bioenergy": 0.0008,
+      "Coal": 0.4268,
+      "Gas": 0.3998,
+      "Hydro": 0.0142,
+      "Nuclear": 0.0637,
+      "Other Fossil": 0.0261,
       "Other Renewables": 0,
-      "Solar": 0.0459,
-      "Wind": 0.0132
+      "Solar": 0.0462,
+      "Wind": 0.0223
     },
     "2024": {
-      "Bioenergy": 0.0004,
-      "Coal": 0.4505,
-      "Gas": 0.3881,
-      "Hydro": 0.0231,
-      "Nuclear": 0.0552,
-      "Other Fossil": 0.0261,
+      "Bioenergy": 0.0008,
+      "Coal": 0.397,
+      "Gas": 0.4291,
+      "Hydro": 0.0147,
+      "Nuclear": 0.0426,
+      "Other Fossil": 0.0274,
       "Other Renewables": 0,
-      "Solar": 0.0465,
-      "Wind": 0.0102
+      "Solar": 0.0522,
+      "Wind": 0.0362
     },
     "2025": {
-      "Bioenergy": 0.0004,
-      "Coal": 0.4505,
-      "Gas": 0.3881,
-      "Hydro": 0.0231,
-      "Nuclear": 0.0552,
-      "Other Fossil": 0.0261,
+      "Bioenergy": 0.001,
+      "Coal": 0.3319,
+      "Gas": 0.4696,
+      "Hydro": 0.0135,
+      "Nuclear": 0.034,
+      "Other Fossil": 0.0291,
       "Other Renewables": 0,
-      "Solar": 0.0465,
-      "Wind": 0.0102
+      "Solar": 0.0434,
+      "Wind": 0.0775
     }
   },
   "TZ": {
@@ -15598,10 +15598,10 @@
     },
     "2022": {
       "Bioenergy": 0.0001,
-      "Coal": 0.2257,
+      "Coal": 0.2258,
       "Gas": 0.0443,
-      "Hydro": 0.0785,
-      "Nuclear": 0.5907,
+      "Hydro": 0.0783,
+      "Nuclear": 0.5908,
       "Other Fossil": 0.0001,
       "Other Renewables": 0,
       "Solar": 0.0001,
@@ -15789,10 +15789,10 @@
     },
     "2025": {
       "Bioenergy": 0.0103,
-      "Coal": 0.1774,
+      "Coal": 0.1773,
       "Gas": 0.3706,
       "Hydro": 0.0577,
-      "Nuclear": 0.179,
+      "Nuclear": 0.1789,
       "Other Fossil": 0.0089,
       "Other Renewables": 0.004,
       "Solar": 0.068,
@@ -15870,9 +15870,9 @@
       "Bioenergy": 0.1421,
       "Coal": 0.0031,
       "Gas": 0.05,
-      "Hydro": 0.4089,
+      "Hydro": 0.4092,
       "Nuclear": 0.0021,
-      "Other Fossil": 0.0214,
+      "Other Fossil": 0.0212,
       "Other Renewables": 0.0005,
       "Solar": 0.049,
       "Wind": 0.3227
@@ -16342,14 +16342,14 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Coal": 0.5651,
-      "Gas": 0.0615,
-      "Hydro": 0.2113,
+      "Coal": 0.58,
+      "Gas": 0.0654,
+      "Hydro": 0.1961,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0929,
-      "Wind": 0.0692
+      "Solar": 0.0953,
+      "Wind": 0.0633
     }
   },
   "VU": {
@@ -16579,14 +16579,14 @@
     },
     "2025": {
       "Bioenergy": 0.0084,
-      "Coal": 0.6813,
-      "Gas": 0.0764,
-      "Hydro": 0.0687,
+      "Coal": 0.681,
+      "Gas": 0.0761,
+      "Hydro": 0.0686,
       "Nuclear": 0.0598,
-      "Other Fossil": 0.0065,
+      "Other Fossil": 0.007,
       "Other Renewables": 0.0019,
       "Solar": 0.0158,
-      "Wind": 0.0814
+      "Wind": 0.0815
     }
   },
   "YE": {
@@ -16726,25 +16726,25 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Coal": 0.8145,
+      "Coal": 0.8139,
       "Gas": 0.0004,
       "Hydro": 0.0047,
       "Nuclear": 0.0331,
       "Other Fossil": 0.0142,
       "Other Renewables": 0.001,
-      "Solar": 0.0848,
+      "Solar": 0.0854,
       "Wind": 0.0472
     },
     "2025": {
       "Bioenergy": 0,
-      "Coal": 0.7431,
+      "Coal": 0.7623,
       "Gas": 0,
-      "Hydro": 0.0031,
-      "Nuclear": 0.0655,
-      "Other Fossil": 0.025,
-      "Other Renewables": 0.001,
-      "Solar": 0.1128,
-      "Wind": 0.0494
+      "Hydro": 0.0033,
+      "Nuclear": 0.055,
+      "Other Fossil": 0.0269,
+      "Other Renewables": 0.0011,
+      "Solar": 0.1032,
+      "Wind": 0.0482
     }
   },
   "ZM": {