npm - @digital4better/data - Versions diffs - 1.2.26 → 1.2.28 - Mend

@digital4better/data 1.2.26 → 1.2.28

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 +166 -166
package/data/factor/continent-monthly-green.json +1241 -1241
package/data/factor/continent-monthly.csv +191 -191
package/data/factor/continent-monthly.json +1293 -1293
package/data/factor/continent-yearly-green.csv +22 -22
package/data/factor/continent-yearly-green.json +176 -176
package/data/factor/continent-yearly.csv +25 -25
package/data/factor/continent-yearly.json +166 -166
package/data/factor/country-monthly-green.csv +1184 -1184
package/data/factor/country-monthly-green.json +9937 -9937
package/data/factor/country-monthly.csv +1273 -1273
package/data/factor/country-monthly.json +9498 -9498
package/data/factor/country-yearly-green.csv +201 -201
package/data/factor/country-yearly-green.json +1619 -1619
package/data/factor/country-yearly.csv +202 -202
package/data/factor/country-yearly.json +1485 -1485
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 +76 -76
package/data/factor/world-monthly-green.json +682 -682
package/data/factor/world-monthly.csv +76 -76
package/data/factor/world-monthly.json +681 -681
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 +58 -58
package/data/mix/continent-monthly-green.csv +124 -124
package/data/mix/continent-monthly-green.json +354 -354
package/data/mix/continent-monthly.csv +124 -124
package/data/mix/continent-monthly.json +576 -576
package/data/mix/continent-yearly-green.csv +13 -13
package/data/mix/continent-yearly-green.json +43 -43
package/data/mix/continent-yearly.csv +13 -13
package/data/mix/continent-yearly.json +53 -53
package/data/mix/country-monthly-green.csv +1001 -1001
package/data/mix/country-monthly-green.json +3327 -3327
package/data/mix/country-monthly.csv +1001 -1001
package/data/mix/country-monthly.json +4059 -4059
package/data/mix/country-yearly-green.csv +116 -116
package/data/mix/country-yearly-green.json +371 -371
package/data/mix/country-yearly.csv +116 -116
package/data/mix/country-yearly.json +465 -465
package/data/mix/subdivision-monthly-green.csv +100 -100
package/data/mix/subdivision-monthly-green.json +354 -354
package/data/mix/subdivision-monthly.csv +100 -100
package/data/mix/subdivision-monthly.json +678 -678
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 +278 -278
package/data/mix/world-monthly.csv +75 -75
package/data/mix/world-monthly.json +381 -381
package/data/mix/world-yearly-green.csv +5 -5
package/data/mix/world-yearly-green.json +17 -17
package/data/mix/world-yearly.csv +5 -5
package/data/mix/world-yearly.json +17 -17
package/package.json +2 -2

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

@@ -88,29 +88,29 @@
       "Other Fossil": 0.0237,
       "Other Renewables": 0.0043,
       "Solar": 0.0331,
-      "Wind": 0.0316
+      "Wind": 0.0317
     },
     "2020": {
       "Bioenergy": 0.0132,
-      "Coal": 0.4553,
+      "Coal": 0.4554,
       "Gas": 0.0907,
       "Hydro": 0.3005,
-      "Nuclear": 0.0411,
+      "Nuclear": 0.0412,
       "Other Fossil": 0.0228,
       "Other Renewables": 0.0037,
-      "Solar": 0.0375,
+      "Solar": 0.0374,
       "Wind": 0.035
     },
     "2021": {
       "Bioenergy": 0.0148,
-      "Coal": 0.4534,
+      "Coal": 0.4535,
       "Gas": 0.0858,
       "Hydro": 0.2922,
       "Nuclear": 0.0412,
       "Other Fossil": 0.0231,
       "Other Renewables": 0.0038,
-      "Solar": 0.0418,
-      "Wind": 0.044
+      "Solar": 0.0417,
+      "Wind": 0.0438
     },
     "2022": {
       "Bioenergy": 0.0161,
@@ -120,40 +120,40 @@
       "Nuclear": 0.041,
       "Other Fossil": 0.0233,
       "Other Renewables": 0.004,
-      "Solar": 0.049,
+      "Solar": 0.0489,
       "Wind": 0.0488
     },
     "2023": {
-      "Bioenergy": 0.0164,
-      "Coal": 0.447,
+      "Bioenergy": 0.0168,
+      "Coal": 0.4468,
       "Gas": 0.0778,
       "Hydro": 0.2813,
       "Nuclear": 0.0411,
-      "Other Fossil": 0.0213,
+      "Other Fossil": 0.0212,
       "Other Renewables": 0.004,
       "Solar": 0.057,
-      "Wind": 0.054
+      "Wind": 0.0541
     },
     "2024": {
-      "Bioenergy": 0.0158,
-      "Coal": 0.4338,
+      "Bioenergy": 0.0161,
+      "Coal": 0.4337,
       "Gas": 0.0756,
       "Hydro": 0.2845,
       "Nuclear": 0.0403,
-      "Other Fossil": 0.0202,
+      "Other Fossil": 0.0201,
       "Other Renewables": 0.0041,
-      "Solar": 0.069,
-      "Wind": 0.0566
+      "Solar": 0.0689,
+      "Wind": 0.0567
     },
     "2025": {
-      "Bioenergy": 0.0163,
-      "Coal": 0.4288,
-      "Gas": 0.0757,
-      "Hydro": 0.2591,
-      "Nuclear": 0.0437,
-      "Other Fossil": 0.021,
-      "Other Renewables": 0.0042,
-      "Solar": 0.0815,
+      "Bioenergy": 0.0168,
+      "Coal": 0.4317,
+      "Gas": 0.076,
+      "Hydro": 0.2593,
+      "Nuclear": 0.0444,
+      "Other Fossil": 0.0204,
+      "Other Renewables": 0.0043,
+      "Solar": 0.0773,
       "Wind": 0.0698
     }
   },
@@ -309,9 +309,9 @@
       "Gas": 0.0785,
       "Hydro": 0.7321,
       "Nuclear": 0.063,
-      "Other Fossil": 0.0074,
+      "Other Fossil": 0.0075,
       "Other Renewables": 0.0021,
-      "Solar": 0.0245,
+      "Solar": 0.0244,
       "Wind": 0.0386
     }
   },
@@ -520,36 +520,36 @@
     },
     "2023": {
       "Bioenergy": 0.0082,
-      "Coal": 0.011,
-      "Gas": 0.4813,
+      "Coal": 0.0177,
+      "Gas": 0.4744,
       "Hydro": 0.2943,
       "Nuclear": 0.0616,
       "Other Fossil": 0.0174,
       "Other Renewables": 0.0003,
       "Solar": 0.0242,
-      "Wind": 0.1017
+      "Wind": 0.1018
     },
     "2024": {
       "Bioenergy": 0.0088,
-      "Coal": 0.0061,
-      "Gas": 0.508,
+      "Coal": 0.01,
+      "Gas": 0.5042,
       "Hydro": 0.2506,
       "Nuclear": 0.072,
       "Other Fossil": 0.0119,
       "Other Renewables": 0.0002,
       "Solar": 0.0288,
-      "Wind": 0.1136
+      "Wind": 0.1137
     },
     "2025": {
-      "Bioenergy": 0.0084,
-      "Coal": 0.0031,
-      "Gas": 0.5806,
-      "Hydro": 0.1853,
-      "Nuclear": 0.0681,
-      "Other Fossil": 0.0103,
+      "Bioenergy": 0.0089,
+      "Coal": 0.0051,
+      "Gas": 0.5679,
+      "Hydro": 0.1897,
+      "Nuclear": 0.0702,
+      "Other Fossil": 0.0095,
       "Other Renewables": 0.0001,
-      "Solar": 0.0324,
-      "Wind": 0.1118
+      "Solar": 0.0329,
+      "Wind": 0.1158
     }
   },
   "AS": {
@@ -699,15 +699,15 @@
       "Wind": 0.1338
     },
     "2025": {
-      "Bioenergy": 0.033,
-      "Coal": 0.0159,
-      "Gas": 0.2105,
-      "Hydro": 0.4663,
-      "Nuclear": 0.0217,
-      "Other Fossil": 0.0169,
+      "Bioenergy": 0.0331,
+      "Coal": 0.016,
+      "Gas": 0.209,
+      "Hydro": 0.466,
+      "Nuclear": 0.0218,
+      "Other Fossil": 0.017,
       "Other Renewables": 0.0007,
-      "Solar": 0.0937,
-      "Wind": 0.1412
+      "Solar": 0.0948,
+      "Wind": 0.1416
     }
   },
   "AU": {
@@ -1136,7 +1136,7 @@
       "Nuclear": 0.0046,
       "Other Fossil": 0.239,
       "Other Renewables": 0.0004,
-      "Solar": 0.0066,
+      "Solar": 0.0065,
       "Wind": 0.0049
     },
     "2022": {
@@ -1158,11 +1158,11 @@
       "Nuclear": 0.0089,
       "Other Fossil": 0.1551,
       "Other Renewables": 0.0009,
-      "Solar": 0.0177,
+      "Solar": 0.0178,
       "Wind": 0.0116
     },
     "2024": {
-      "Bioenergy": 0.0032,
+      "Bioenergy": 0.0033,
       "Coal": 0.3646,
       "Gas": 0.4499,
       "Hydro": 0.0281,
@@ -1173,14 +1173,14 @@
       "Wind": 0.0115
     },
     "2025": {
-      "Bioenergy": 0.0034,
-      "Coal": 0.359,
-      "Gas": 0.4407,
+      "Bioenergy": 0.0036,
+      "Coal": 0.3596,
+      "Gas": 0.4408,
       "Hydro": 0.0144,
-      "Nuclear": 0.0093,
-      "Other Fossil": 0.1278,
+      "Nuclear": 0.0094,
+      "Other Fossil": 0.1277,
       "Other Renewables": 0.0009,
-      "Solar": 0.0297,
+      "Solar": 0.0288,
       "Wind": 0.0148
     }
   },
@@ -1252,14 +1252,14 @@
       "Wind": 0.1779
     },
     "2025": {
-      "Bioenergy": 0.0124,
-      "Coal": 0.021,
-      "Gas": 0.2309,
-      "Hydro": 0.0252,
-      "Nuclear": 0.3576,
-      "Other Fossil": 0.0997,
+      "Bioenergy": 0.0123,
+      "Coal": 0.0209,
+      "Gas": 0.2303,
+      "Hydro": 0.0269,
+      "Nuclear": 0.3567,
+      "Other Fossil": 0.0999,
       "Other Renewables": 0.001,
-      "Solar": 0.1136,
+      "Solar": 0.1133,
       "Wind": 0.1387
     }
   },
@@ -1932,10 +1932,10 @@
     "2022": {
       "Bioenergy": 0.0127,
       "Coal": 0.011,
-      "Gas": 0.0617,
+      "Gas": 0.062,
       "Hydro": 0.7003,
       "Nuclear": 0.0233,
-      "Other Fossil": 0.0155,
+      "Other Fossil": 0.0151,
       "Other Renewables": 0,
       "Solar": 0.0482,
       "Wind": 0.1272
@@ -1943,10 +1943,10 @@
     "2023": {
       "Bioenergy": 0.0135,
       "Coal": 0.0115,
-      "Gas": 0.0531,
+      "Gas": 0.0532,
       "Hydro": 0.6685,
       "Nuclear": 0.0219,
-      "Other Fossil": 0.0116,
+      "Other Fossil": 0.0115,
       "Other Renewables": 0,
       "Solar": 0.0782,
       "Wind": 0.1416
@@ -1954,24 +1954,24 @@
     "2024": {
       "Bioenergy": 0.0136,
       "Coal": 0.0131,
-      "Gas": 0.0649,
+      "Gas": 0.0651,
       "Hydro": 0.6148,
       "Nuclear": 0.0226,
-      "Other Fossil": 0.0113,
+      "Other Fossil": 0.0111,
       "Other Renewables": 0,
       "Solar": 0.1076,
       "Wind": 0.1521
     },
     "2025": {
-      "Bioenergy": 0.0049,
-      "Coal": 0.0076,
-      "Gas": 0.0325,
-      "Hydro": 0.6767,
-      "Nuclear": 0.0221,
+      "Bioenergy": 0.0059,
+      "Coal": 0.0084,
+      "Gas": 0.0361,
+      "Hydro": 0.6746,
+      "Nuclear": 0.0211,
       "Other Fossil": 0.0095,
       "Other Renewables": 0,
-      "Solar": 0.128,
-      "Wind": 0.1185
+      "Solar": 0.1261,
+      "Wind": 0.1183
     }
   },
   "BS": {
@@ -2327,19 +2327,19 @@
     "2022": {
       "Bioenergy": 0.1705,
       "Coal": 0.0142,
-      "Gas": 0.1011,
+      "Gas": 0.1012,
       "Hydro": 0.5286,
       "Nuclear": 0.0084,
-      "Other Fossil": 0.1098,
+      "Other Fossil": 0.1097,
       "Other Renewables": 0.0029,
       "Solar": 0.0295,
       "Wind": 0.035
     },
     "2023": {
       "Bioenergy": 0.1707,
-      "Coal": 0.0171,
-      "Gas": 0.1023,
-      "Hydro": 0.5191,
+      "Coal": 0.0174,
+      "Gas": 0.102,
+      "Hydro": 0.5192,
       "Nuclear": 0.0088,
       "Other Fossil": 0.1057,
       "Other Renewables": 0.0026,
@@ -2348,22 +2348,22 @@
     },
     "2024": {
       "Bioenergy": 0.171,
-      "Coal": 0.0156,
-      "Gas": 0.1043,
+      "Coal": 0.0158,
+      "Gas": 0.1042,
       "Hydro": 0.5107,
       "Nuclear": 0.0092,
-      "Other Fossil": 0.1039,
+      "Other Fossil": 0.1038,
       "Other Renewables": 0.0024,
       "Solar": 0.0419,
       "Wind": 0.0409
     },
     "2025": {
       "Bioenergy": 0.1694,
-      "Coal": 0.0124,
-      "Gas": 0.093,
-      "Hydro": 0.5271,
+      "Coal": 0.0125,
+      "Gas": 0.0929,
+      "Hydro": 0.5273,
       "Nuclear": 0.0095,
-      "Other Fossil": 0.1019,
+      "Other Fossil": 0.1018,
       "Other Renewables": 0.0024,
       "Solar": 0.0476,
       "Wind": 0.0367
@@ -2753,15 +2753,15 @@
       "Wind": 0.0046
     },
     "2025": {
-      "Bioenergy": 0.0029,
-      "Coal": 0.0149,
-      "Gas": 0.026,
-      "Hydro": 0.4284,
-      "Nuclear": 0.3678,
-      "Other Fossil": 0.0497,
-      "Other Renewables": 0.0007,
-      "Solar": 0.0942,
-      "Wind": 0.0154
+      "Bioenergy": 0.0028,
+      "Coal": 0.0148,
+      "Gas": 0.0257,
+      "Hydro": 0.4333,
+      "Nuclear": 0.364,
+      "Other Fossil": 0.0518,
+      "Other Renewables": 0.0006,
+      "Solar": 0.0917,
+      "Wind": 0.0152
     }
   },
   "CI": {
@@ -3085,7 +3085,7 @@
       "Bioenergy": 0.0151,
       "Coal": 0.662,
       "Gas": 0.0289,
-      "Hydro": 0.1579,
+      "Hydro": 0.1578,
       "Nuclear": 0.0475,
       "Other Fossil": 0.0028,
       "Other Renewables": 0,
@@ -3100,19 +3100,19 @@
       "Nuclear": 0.0481,
       "Other Fossil": 0.0026,
       "Other Renewables": 0,
-      "Solar": 0.0343,
+      "Solar": 0.0342,
       "Wind": 0.0612
     },
     "2021": {
       "Bioenergy": 0.0193,
-      "Coal": 0.6386,
+      "Coal": 0.6389,
       "Gas": 0.0316,
-      "Hydro": 0.1423,
+      "Hydro": 0.1424,
       "Nuclear": 0.0487,
       "Other Fossil": 0.0021,
       "Other Renewables": 0,
-      "Solar": 0.0391,
-      "Wind": 0.0783
+      "Solar": 0.0389,
+      "Wind": 0.078
     },
     "2022": {
       "Bioenergy": 0.0205,
@@ -3126,37 +3126,37 @@
       "Wind": 0.0878
     },
     "2023": {
-      "Bioenergy": 0.0204,
-      "Coal": 0.6193,
+      "Bioenergy": 0.021,
+      "Coal": 0.6187,
       "Gas": 0.0299,
-      "Hydro": 0.1241,
+      "Hydro": 0.124,
       "Nuclear": 0.0466,
-      "Other Fossil": 0.0018,
+      "Other Fossil": 0.0017,
       "Other Renewables": 0,
       "Solar": 0.0628,
       "Wind": 0.0952
     },
     "2024": {
-      "Bioenergy": 0.0195,
-      "Coal": 0.5919,
+      "Bioenergy": 0.02,
+      "Coal": 0.5913,
       "Gas": 0.0286,
       "Hydro": 0.1294,
-      "Nuclear": 0.0448,
+      "Nuclear": 0.0449,
       "Other Fossil": 0.0017,
       "Other Renewables": 0,
-      "Solar": 0.0842,
-      "Wind": 0.1
+      "Solar": 0.0841,
+      "Wind": 0.1001
     },
     "2025": {
-      "Bioenergy": 0.019,
-      "Coal": 0.5767,
+      "Bioenergy": 0.0195,
+      "Coal": 0.5749,
       "Gas": 0.0278,
-      "Hydro": 0.0929,
-      "Nuclear": 0.0488,
+      "Hydro": 0.0957,
+      "Nuclear": 0.0496,
       "Other Fossil": 0.0016,
       "Other Renewables": 0,
-      "Solar": 0.105,
-      "Wind": 0.1283
+      "Solar": 0.103,
+      "Wind": 0.128
     }
   },
   "CO": {
@@ -3706,9 +3706,9 @@
       "Gas": 0.1717,
       "Hydro": 0.0358,
       "Nuclear": 0.0064,
-      "Other Fossil": 0.0719,
+      "Other Fossil": 0.0718,
       "Other Renewables": 0.0002,
-      "Solar": 0.141,
+      "Solar": 0.1411,
       "Wind": 0.2407
     }
   },
@@ -3859,15 +3859,15 @@
       "Wind": 0.5431
     },
     "2025": {
-      "Bioenergy": 0.1312,
-      "Coal": 0.1093,
+      "Bioenergy": 0.1306,
+      "Coal": 0.1087,
       "Gas": 0.0961,
-      "Hydro": 0.0281,
-      "Nuclear": 0.0335,
+      "Hydro": 0.0282,
+      "Nuclear": 0.0336,
       "Other Fossil": 0.0393,
       "Other Renewables": 0.0011,
-      "Solar": 0.0941,
-      "Wind": 0.4674
+      "Solar": 0.0926,
+      "Wind": 0.4699
     }
   },
   "DM": {
@@ -4165,7 +4165,7 @@
     },
     "2024": {
       "Bioenergy": 0.014,
-      "Coal": 0.0013,
+      "Coal": 0.0014,
       "Gas": 0.0384,
       "Hydro": 0.6581,
       "Nuclear": 0.0008,
@@ -4254,15 +4254,15 @@
       "Wind": 0.2017
     },
     "2025": {
-      "Bioenergy": 0.0784,
-      "Coal": 0.0458,
-      "Gas": 0.0805,
-      "Hydro": 0.0508,
-      "Nuclear": 0.0635,
-      "Other Fossil": 0.3614,
+      "Bioenergy": 0.0773,
+      "Coal": 0.0452,
+      "Gas": 0.0793,
+      "Hydro": 0.0501,
+      "Nuclear": 0.0626,
+      "Other Fossil": 0.3562,
       "Other Renewables": 0.002,
-      "Solar": 0.0954,
-      "Wind": 0.2222
+      "Solar": 0.1083,
+      "Wind": 0.219
     }
   },
   "EG": {
@@ -4324,24 +4324,24 @@
     "2024": {
       "Bioenergy": 0.0005,
       "Coal": 0,
-      "Gas": 0.8034,
-      "Hydro": 0.0674,
+      "Gas": 0.8051,
+      "Hydro": 0.0668,
       "Nuclear": 0,
-      "Other Fossil": 0.0748,
+      "Other Fossil": 0.0749,
       "Other Renewables": 0,
       "Solar": 0.0245,
-      "Wind": 0.0294
+      "Wind": 0.0282
     },
     "2025": {
       "Bioenergy": 0.0006,
       "Coal": 0,
-      "Gas": 0.7876,
-      "Hydro": 0.0675,
+      "Gas": 0.8109,
+      "Hydro": 0.0589,
       "Nuclear": 0,
-      "Other Fossil": 0.0734,
+      "Other Fossil": 0.0754,
       "Other Renewables": 0,
-      "Solar": 0.0302,
-      "Wind": 0.0408
+      "Solar": 0.0291,
+      "Wind": 0.0251
     }
   },
   "ER": {
@@ -4494,12 +4494,12 @@
       "Bioenergy": 0.0138,
       "Coal": 0.0111,
       "Gas": 0.1617,
-      "Hydro": 0.1672,
-      "Nuclear": 0.2096,
+      "Hydro": 0.1673,
+      "Nuclear": 0.2092,
       "Other Fossil": 0.0067,
       "Other Renewables": 0.0024,
-      "Solar": 0.1707,
-      "Wind": 0.2569
+      "Solar": 0.1711,
+      "Wind": 0.2567
     }
   },
   "ET": {
@@ -4652,7 +4652,7 @@
       "Bioenergy": 0.1292,
       "Coal": 0.0238,
       "Gas": 0.033,
-      "Hydro": 0.1561,
+      "Hydro": 0.1562,
       "Nuclear": 0.316,
       "Other Fossil": 0.052,
       "Other Renewables": 0.0038,
@@ -4967,12 +4967,12 @@
     "2025": {
       "Bioenergy": 0.0054,
       "Coal": 0.0036,
-      "Gas": 0.0445,
+      "Gas": 0.0446,
       "Hydro": 0.1089,
-      "Nuclear": 0.6962,
+      "Nuclear": 0.6961,
       "Other Fossil": 0.0071,
       "Other Renewables": 0,
-      "Solar": 0.043,
+      "Solar": 0.0428,
       "Wind": 0.0914
     }
   },
@@ -5244,51 +5244,51 @@
       "Nuclear": 0.0072,
       "Other Fossil": 0.0013,
       "Other Renewables": 0.0007,
-      "Solar": 0.0055,
-      "Wind": 0.0165
+      "Solar": 0.0054,
+      "Wind": 0.0166
     },
     "2022": {
       "Bioenergy": 0.0023,
-      "Coal": 0.0598,
+      "Coal": 0.0599,
       "Gas": 0.2365,
       "Hydro": 0.6751,
       "Nuclear": 0.0056,
       "Other Fossil": 0.0011,
       "Other Renewables": 0.0005,
-      "Solar": 0.0048,
-      "Wind": 0.0143
+      "Solar": 0.0046,
+      "Wind": 0.0142
     },
     "2023": {
-      "Bioenergy": 0.0013,
+      "Bioenergy": 0.0014,
       "Coal": 0.0338,
-      "Gas": 0.249,
+      "Gas": 0.2491,
       "Hydro": 0.6963,
       "Nuclear": 0.0032,
       "Other Fossil": 0.0005,
       "Other Renewables": 0.0003,
-      "Solar": 0.0032,
+      "Solar": 0.0031,
       "Wind": 0.0124
     },
     "2024": {
       "Bioenergy": 0.0016,
-      "Coal": 0.0405,
-      "Gas": 0.2033,
-      "Hydro": 0.731,
-      "Nuclear": 0.0038,
+      "Coal": 0.0406,
+      "Gas": 0.2034,
+      "Hydro": 0.7311,
+      "Nuclear": 0.0039,
       "Other Fossil": 0.0004,
       "Other Renewables": 0.0004,
-      "Solar": 0.0053,
+      "Solar": 0.0051,
       "Wind": 0.0136
     },
     "2025": {
-      "Bioenergy": 0.0051,
-      "Coal": 0.129,
-      "Gas": 0.2516,
-      "Hydro": 0.5466,
-      "Nuclear": 0.0134,
-      "Other Fossil": 0.0016,
+      "Bioenergy": 0.0052,
+      "Coal": 0.1299,
+      "Gas": 0.2517,
+      "Hydro": 0.5467,
+      "Nuclear": 0.0136,
+      "Other Fossil": 0.0015,
       "Other Renewables": 0.0013,
-      "Solar": 0.022,
+      "Solar": 0.0207,
       "Wind": 0.0293
     }
   },
@@ -5993,14 +5993,14 @@
     },
     "2025": {
       "Bioenergy": 0.001,
-      "Coal": 0.0802,
-      "Gas": 0.4365,
-      "Hydro": 0.0434,
-      "Nuclear": 0.0067,
+      "Coal": 0.0806,
+      "Gas": 0.4387,
+      "Hydro": 0.0436,
+      "Nuclear": 0.0068,
       "Other Fossil": 0.0008,
       "Other Renewables": 0.0002,
-      "Solar": 0.223,
-      "Wind": 0.2081
+      "Solar": 0.2189,
+      "Wind": 0.2092
     }
   },
   "GT": {
@@ -6324,7 +6324,7 @@
       "Bioenergy": 0.0067,
       "Coal": 0.5737,
       "Gas": 0.3454,
-      "Hydro": 0.0348,
+      "Hydro": 0.0347,
       "Nuclear": 0.0134,
       "Other Fossil": 0.0063,
       "Other Renewables": 0.0014,
@@ -6344,7 +6344,7 @@
     },
     "2021": {
       "Bioenergy": 0.0077,
-      "Coal": 0.5705,
+      "Coal": 0.5706,
       "Gas": 0.343,
       "Hydro": 0.0328,
       "Nuclear": 0.0134,
@@ -6361,12 +6361,12 @@
       "Nuclear": 0.0134,
       "Other Fossil": 0.0062,
       "Other Renewables": 0.0013,
-      "Solar": 0.0133,
+      "Solar": 0.0132,
       "Wind": 0.0159
     },
     "2023": {
-      "Bioenergy": 0.0082,
-      "Coal": 0.5685,
+      "Bioenergy": 0.0083,
+      "Coal": 0.5684,
       "Gas": 0.3404,
       "Hydro": 0.0292,
       "Nuclear": 0.0134,
@@ -6376,25 +6376,25 @@
       "Wind": 0.0176
     },
     "2024": {
-      "Bioenergy": 0.008,
-      "Coal": 0.5642,
+      "Bioenergy": 0.0081,
+      "Coal": 0.5641,
       "Gas": 0.3397,
       "Hydro": 0.0303,
       "Nuclear": 0.0131,
       "Other Fossil": 0.0051,
       "Other Renewables": 0.0013,
-      "Solar": 0.0198,
-      "Wind": 0.0184
+      "Solar": 0.0197,
+      "Wind": 0.0185
     },
     "2025": {
-      "Bioenergy": 0.0081,
-      "Coal": 0.5625,
-      "Gas": 0.3397,
-      "Hydro": 0.022,
-      "Nuclear": 0.0142,
-      "Other Fossil": 0.0054,
+      "Bioenergy": 0.0083,
+      "Coal": 0.5635,
+      "Gas": 0.3398,
+      "Hydro": 0.0221,
+      "Nuclear": 0.0145,
+      "Other Fossil": 0.0052,
       "Other Renewables": 0.0014,
-      "Solar": 0.0238,
+      "Solar": 0.0225,
       "Wind": 0.0227
     }
   },
@@ -6550,7 +6550,7 @@
       "Gas": 0.225,
       "Hydro": 0.3586,
       "Nuclear": 0.0432,
-      "Other Fossil": 0.0114,
+      "Other Fossil": 0.0115,
       "Other Renewables": 0.0144,
       "Solar": 0.0617,
       "Wind": 0.2158
@@ -6705,10 +6705,10 @@
     "2025": {
       "Bioenergy": 0.0399,
       "Coal": 0.0691,
-      "Gas": 0.2314,
+      "Gas": 0.2313,
       "Hydro": 0.041,
       "Nuclear": 0.3714,
-      "Other Fossil": 0.0176,
+      "Other Fossil": 0.0177,
       "Other Renewables": 0.0039,
       "Solar": 0.1841,
       "Wind": 0.0417
@@ -6772,7 +6772,7 @@
     },
     "2024": {
       "Bioenergy": 0.0411,
-      "Coal": 0.5904,
+      "Coal": 0.5903,
       "Gas": 0.2103,
       "Hydro": 0.0719,
       "Nuclear": 0.0003,
@@ -6864,11 +6864,11 @@
       "Bioenergy": 0.0068,
       "Coal": 0.0486,
       "Gas": 0.4614,
-      "Hydro": 0.0485,
+      "Hydro": 0.0486,
       "Nuclear": 0.027,
-      "Other Fossil": 0.0474,
+      "Other Fossil": 0.0475,
       "Other Renewables": 0.0009,
-      "Solar": 0.0182,
+      "Solar": 0.0181,
       "Wind": 0.341
     }
   },
@@ -7337,12 +7337,12 @@
     "2025": {
       "Bioenergy": 0.0545,
       "Coal": 0.0394,
-      "Gas": 0.5016,
+      "Gas": 0.5015,
       "Hydro": 0.1133,
-      "Nuclear": 0.0349,
+      "Nuclear": 0.035,
       "Other Fossil": 0.0301,
       "Other Renewables": 0.019,
-      "Solar": 0.0795,
+      "Solar": 0.0794,
       "Wind": 0.1277
     }
   },
@@ -7561,26 +7561,26 @@
       "Wind": 0.0183
     },
     "2024": {
-      "Bioenergy": 0.0594,
-      "Coal": 0.2823,
-      "Gas": 0.3064,
-      "Hydro": 0.0769,
-      "Nuclear": 0.0898,
-      "Other Fossil": 0.0352,
-      "Other Renewables": 0.0102,
-      "Solar": 0.121,
-      "Wind": 0.0187
+      "Bioenergy": 0.0589,
+      "Coal": 0.2836,
+      "Gas": 0.3067,
+      "Hydro": 0.0773,
+      "Nuclear": 0.0901,
+      "Other Fossil": 0.034,
+      "Other Renewables": 0.0104,
+      "Solar": 0.1192,
+      "Wind": 0.0198
     },
     "2025": {
-      "Bioenergy": 0.0612,
-      "Coal": 0.3091,
-      "Gas": 0.3143,
-      "Hydro": 0.0471,
-      "Nuclear": 0.0935,
-      "Other Fossil": 0.05,
-      "Other Renewables": 0.0098,
-      "Solar": 0.0941,
-      "Wind": 0.0208
+      "Bioenergy": 0.0655,
+      "Coal": 0.3044,
+      "Gas": 0.3079,
+      "Hydro": 0.0535,
+      "Nuclear": 0.1005,
+      "Other Fossil": 0.033,
+      "Other Renewables": 0.0106,
+      "Solar": 0.0968,
+      "Wind": 0.0279
     }
   },
   "KE": {
@@ -7651,15 +7651,15 @@
       "Wind": 0.1313
     },
     "2025": {
-      "Bioenergy": 0.0264,
-      "Coal": 0.0327,
-      "Gas": 0.0448,
-      "Hydro": 0.2345,
-      "Nuclear": 0.0016,
-      "Other Fossil": 0.085,
-      "Other Renewables": 0.3781,
-      "Solar": 0.0361,
-      "Wind": 0.1607
+      "Bioenergy": 0.0295,
+      "Coal": 0.0301,
+      "Gas": 0.0412,
+      "Hydro": 0.2366,
+      "Nuclear": 0.0015,
+      "Other Fossil": 0.0936,
+      "Other Renewables": 0.3873,
+      "Solar": 0.0345,
+      "Wind": 0.1457
     }
   },
   "KG": {
@@ -7694,7 +7694,7 @@
       "Other Fossil": 0.0017,
       "Other Renewables": 0.0002,
       "Solar": 0.0015,
-      "Wind": 0.0021
+      "Wind": 0.0022
     },
     "2022": {
       "Bioenergy": 0.0018,
@@ -7705,18 +7705,18 @@
       "Other Fossil": 0.0022,
       "Other Renewables": 0.0004,
       "Solar": 0.0043,
-      "Wind": 0.0059
+      "Wind": 0.006
     },
     "2023": {
-      "Bioenergy": 0.0016,
-      "Coal": 0.1592,
+      "Bioenergy": 0.0017,
+      "Coal": 0.1593,
       "Gas": 0.0155,
       "Hydro": 0.8071,
-      "Nuclear": 0.0039,
+      "Nuclear": 0.004,
       "Other Fossil": 0.0029,
       "Other Renewables": 0.0004,
-      "Solar": 0.004,
-      "Wind": 0.0054
+      "Solar": 0.0038,
+      "Wind": 0.0053
     },
     "2024": {
       "Bioenergy": 0.0019,
@@ -7731,13 +7731,13 @@
     },
     "2025": {
       "Bioenergy": 0.0016,
-      "Coal": 0.0989,
+      "Coal": 0.0991,
       "Gas": 0.0157,
       "Hydro": 0.8399,
       "Nuclear": 0.0043,
-      "Other Fossil": 0.0255,
+      "Other Fossil": 0.0254,
       "Other Renewables": 0.0004,
-      "Solar": 0.007,
+      "Solar": 0.0066,
       "Wind": 0.0068
     }
   },
@@ -7755,7 +7755,7 @@
     },
     "2020": {
       "Bioenergy": 0.0126,
-      "Coal": 0.47,
+      "Coal": 0.4701,
       "Gas": 0.0298,
       "Hydro": 0.3862,
       "Nuclear": 0.0135,
@@ -7767,12 +7767,12 @@
     "2021": {
       "Bioenergy": 0.0131,
       "Coal": 0.4694,
-      "Gas": 0.0281,
+      "Gas": 0.0282,
       "Hydro": 0.3834,
       "Nuclear": 0.0135,
       "Other Fossil": 0.0562,
       "Other Renewables": 0.0013,
-      "Solar": 0.0206,
+      "Solar": 0.0205,
       "Wind": 0.0144
     },
     "2022": {
@@ -7787,8 +7787,8 @@
       "Wind": 0.016
     },
     "2023": {
-      "Bioenergy": 0.0137,
-      "Coal": 0.4673,
+      "Bioenergy": 0.0138,
+      "Coal": 0.4672,
       "Gas": 0.0255,
       "Hydro": 0.3799,
       "Nuclear": 0.0135,
@@ -7798,25 +7798,25 @@
       "Wind": 0.0177
     },
     "2024": {
-      "Bioenergy": 0.0135,
-      "Coal": 0.463,
+      "Bioenergy": 0.0136,
+      "Coal": 0.4629,
       "Gas": 0.0248,
       "Hydro": 0.3809,
       "Nuclear": 0.0132,
       "Other Fossil": 0.0552,
       "Other Renewables": 0.0013,
-      "Solar": 0.0295,
+      "Solar": 0.0294,
       "Wind": 0.0186
     },
     "2025": {
-      "Bioenergy": 0.0136,
-      "Coal": 0.4613,
-      "Gas": 0.0248,
+      "Bioenergy": 0.0138,
+      "Coal": 0.4623,
+      "Gas": 0.0249,
       "Hydro": 0.3726,
-      "Nuclear": 0.0144,
-      "Other Fossil": 0.0554,
+      "Nuclear": 0.0146,
+      "Other Fossil": 0.0553,
       "Other Renewables": 0.0014,
-      "Solar": 0.0336,
+      "Solar": 0.0322,
       "Wind": 0.0229
     }
   },
@@ -8204,15 +8204,15 @@
       "Wind": 0.0057
     },
     "2025": {
-      "Bioenergy": 0.0205,
-      "Coal": 0.2387,
-      "Gas": 0.3121,
-      "Hydro": 0.004,
-      "Nuclear": 0.3379,
-      "Other Fossil": 0.008,
-      "Other Renewables": 0.0147,
-      "Solar": 0.0542,
-      "Wind": 0.0098
+      "Bioenergy": 0.02,
+      "Coal": 0.2206,
+      "Gas": 0.3083,
+      "Hydro": 0.0042,
+      "Nuclear": 0.3558,
+      "Other Fossil": 0.0078,
+      "Other Renewables": 0.0155,
+      "Solar": 0.0596,
+      "Wind": 0.0081
     }
   },
   "KW": {
@@ -8442,14 +8442,14 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Coal": 0.5732,
-      "Gas": 0.2898,
-      "Hydro": 0.0658,
+      "Coal": 0.5701,
+      "Gas": 0.288,
+      "Hydro": 0.0657,
       "Nuclear": 0,
-      "Other Fossil": 0.0218,
+      "Other Fossil": 0.0214,
       "Other Renewables": 0,
-      "Solar": 0.0104,
-      "Wind": 0.0391
+      "Solar": 0.0127,
+      "Wind": 0.0423
     }
   },
   "LA": {
@@ -9073,15 +9073,15 @@
       "Wind": 0.1858
     },
     "2025": {
-      "Bioenergy": 0.074,
-      "Coal": 0.1048,
-      "Gas": 0.2076,
-      "Hydro": 0.1362,
-      "Nuclear": 0.1465,
-      "Other Fossil": 0.0407,
+      "Bioenergy": 0.0736,
+      "Coal": 0.1043,
+      "Gas": 0.2063,
+      "Hydro": 0.1355,
+      "Nuclear": 0.1457,
+      "Other Fossil": 0.0406,
       "Other Renewables": 0.0048,
-      "Solar": 0.1127,
-      "Wind": 0.1727
+      "Solar": 0.1118,
+      "Wind": 0.1775
     }
   },
   "LV": {
@@ -9145,22 +9145,22 @@
       "Coal": 0.0391,
       "Gas": 0.2659,
       "Hydro": 0.4251,
-      "Nuclear": 0.0588,
+      "Nuclear": 0.0587,
       "Other Fossil": 0.0103,
       "Other Renewables": 0.0019,
       "Solar": 0.0774,
       "Wind": 0.0675
     },
     "2025": {
-      "Bioenergy": 0.0544,
-      "Coal": 0.013,
-      "Gas": 0.3459,
-      "Hydro": 0.4416,
-      "Nuclear": 0.0196,
-      "Other Fossil": 0.0189,
+      "Bioenergy": 0.0619,
+      "Coal": 0.0128,
+      "Gas": 0.3417,
+      "Hydro": 0.4403,
+      "Nuclear": 0.0193,
+      "Other Fossil": 0.0105,
       "Other Renewables": 0.0007,
-      "Solar": 0.0619,
-      "Wind": 0.0442
+      "Solar": 0.0692,
+      "Wind": 0.0436
     }
   },
   "LY": {
@@ -9378,26 +9378,26 @@
       "Wind": 0.0094
     },
     "2024": {
-      "Bioenergy": 0.0009,
-      "Coal": 0.0046,
-      "Gas": 0.9136,
-      "Hydro": 0.0477,
-      "Nuclear": 0.0067,
-      "Other Fossil": 0.0007,
-      "Other Renewables": 0.0002,
-      "Solar": 0.0125,
-      "Wind": 0.0132
+      "Bioenergy": 0.0014,
+      "Coal": 0.0072,
+      "Gas": 0.8982,
+      "Hydro": 0.0498,
+      "Nuclear": 0.0102,
+      "Other Fossil": 0.0011,
+      "Other Renewables": 0.0003,
+      "Solar": 0.0092,
+      "Wind": 0.0226
     },
     "2025": {
-      "Bioenergy": 0.0006,
-      "Coal": 0.0029,
-      "Gas": 0.9219,
-      "Hydro": 0.0451,
-      "Nuclear": 0.0041,
-      "Other Fossil": 0.0005,
-      "Other Renewables": 0.0001,
-      "Solar": 0.0223,
-      "Wind": 0.0025
+      "Bioenergy": 0.0039,
+      "Coal": 0.019,
+      "Gas": 0.841,
+      "Hydro": 0.0603,
+      "Nuclear": 0.0268,
+      "Other Fossil": 0.0032,
+      "Other Renewables": 0.0009,
+      "Solar": 0.0093,
+      "Wind": 0.0356
     }
   },
   "ME": {
@@ -9472,10 +9472,10 @@
       "Coal": 0.3054,
       "Gas": 0.0654,
       "Hydro": 0.4176,
-      "Nuclear": 0.0553,
-      "Other Fossil": 0.0064,
+      "Nuclear": 0.0554,
+      "Other Fossil": 0.0065,
       "Other Renewables": 0.0019,
-      "Solar": 0.0268,
+      "Solar": 0.0265,
       "Wind": 0.1128
     }
   },
@@ -9626,15 +9626,15 @@
       "Wind": 0.0428
     },
     "2025": {
-      "Bioenergy": 0.0195,
-      "Coal": 0.3149,
-      "Gas": 0.2753,
-      "Hydro": 0.2287,
-      "Nuclear": 0.0549,
-      "Other Fossil": 0.0064,
-      "Other Renewables": 0.0018,
-      "Solar": 0.042,
-      "Wind": 0.0566
+      "Bioenergy": 0.0099,
+      "Coal": 0.3916,
+      "Gas": 0.2704,
+      "Hydro": 0.1793,
+      "Nuclear": 0.0476,
+      "Other Fossil": 0.0056,
+      "Other Renewables": 0.0016,
+      "Solar": 0.0401,
+      "Wind": 0.0539
     }
   },
   "ML": {
@@ -9864,14 +9864,14 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Coal": 0.9152,
+      "Coal": 0.913,
       "Gas": 0,
       "Hydro": 0,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
       "Solar": 0,
-      "Wind": 0.0848
+      "Wind": 0.087
     }
   },
   "MO": {
@@ -9879,49 +9879,49 @@
       "Bioenergy": 0.051,
       "Coal": 0.4999,
       "Gas": 0.1807,
-      "Hydro": 0.1185,
+      "Hydro": 0.1184,
       "Nuclear": 0.0457,
       "Other Fossil": 0.0381,
       "Other Renewables": 0.0048,
       "Solar": 0.0263,
-      "Wind": 0.0351
+      "Wind": 0.0352
     },
     "2020": {
       "Bioenergy": 0.0525,
-      "Coal": 0.4915,
+      "Coal": 0.4916,
       "Gas": 0.178,
       "Hydro": 0.121,
       "Nuclear": 0.0457,
       "Other Fossil": 0.0371,
       "Other Renewables": 0.0041,
-      "Solar": 0.0312,
+      "Solar": 0.0311,
       "Wind": 0.0389
     },
     "2021": {
       "Bioenergy": 0.0542,
-      "Coal": 0.4893,
-      "Gas": 0.1725,
+      "Coal": 0.4895,
+      "Gas": 0.1726,
       "Hydro": 0.1118,
       "Nuclear": 0.0457,
       "Other Fossil": 0.0375,
       "Other Renewables": 0.0043,
       "Solar": 0.0359,
-      "Wind": 0.0488
+      "Wind": 0.0487
     },
     "2022": {
       "Bioenergy": 0.0557,
       "Coal": 0.4789,
       "Gas": 0.168,
-      "Hydro": 0.1118,
+      "Hydro": 0.1117,
       "Nuclear": 0.0455,
       "Other Fossil": 0.0377,
       "Other Renewables": 0.0044,
-      "Solar": 0.0439,
+      "Solar": 0.0438,
       "Wind": 0.0542
     },
     "2023": {
-      "Bioenergy": 0.056,
-      "Coal": 0.4823,
+      "Bioenergy": 0.0564,
+      "Coal": 0.482,
       "Gas": 0.1637,
       "Hydro": 0.0997,
       "Nuclear": 0.0457,
@@ -9931,25 +9931,25 @@
       "Wind": 0.06
     },
     "2024": {
-      "Bioenergy": 0.0554,
-      "Coal": 0.4676,
+      "Bioenergy": 0.0557,
+      "Coal": 0.4675,
       "Gas": 0.1613,
-      "Hydro": 0.1033,
+      "Hydro": 0.1032,
       "Nuclear": 0.0448,
-      "Other Fossil": 0.0342,
+      "Other Fossil": 0.0341,
       "Other Renewables": 0.0045,
-      "Solar": 0.0662,
+      "Solar": 0.066,
       "Wind": 0.0629
     },
     "2025": {
-      "Bioenergy": 0.0559,
-      "Coal": 0.462,
-      "Gas": 0.1613,
-      "Hydro": 0.075,
-      "Nuclear": 0.0486,
-      "Other Fossil": 0.0351,
-      "Other Renewables": 0.0046,
-      "Solar": 0.08,
+      "Bioenergy": 0.0565,
+      "Coal": 0.4652,
+      "Gas": 0.1617,
+      "Hydro": 0.0753,
+      "Nuclear": 0.0493,
+      "Other Fossil": 0.0344,
+      "Other Renewables": 0.0048,
+      "Solar": 0.0753,
       "Wind": 0.0775
     }
   },
@@ -10258,15 +10258,15 @@
       "Wind": 0.0282
     },
     "2025": {
-      "Bioenergy": 0.0066,
-      "Coal": 0.0325,
-      "Gas": 0.7288,
-      "Hydro": 0.0371,
-      "Nuclear": 0.0457,
-      "Other Fossil": 0.013,
-      "Other Renewables": 0.0015,
-      "Solar": 0.1068,
-      "Wind": 0.0282
+      "Bioenergy": 0.0072,
+      "Coal": 0.0354,
+      "Gas": 0.6695,
+      "Hydro": 0.0409,
+      "Nuclear": 0.0501,
+      "Other Fossil": 0.0282,
+      "Other Renewables": 0.0017,
+      "Solar": 0.1361,
+      "Wind": 0.0308
     }
   },
   "MU": {
@@ -11107,7 +11107,7 @@
     "2023": {
       "Bioenergy": 0.1685,
       "Coal": 0.0035,
-      "Gas": 0.0208,
+      "Gas": 0.0207,
       "Hydro": 0.0859,
       "Nuclear": 0.0018,
       "Other Fossil": 0.3989,
@@ -11130,7 +11130,7 @@
       "Bioenergy": 0.1682,
       "Coal": 0.0025,
       "Gas": 0.0189,
-      "Hydro": 0.0875,
+      "Hydro": 0.0876,
       "Nuclear": 0.0019,
       "Other Fossil": 0.3981,
       "Other Renewables": 0.1562,
@@ -11206,15 +11206,15 @@
       "Wind": 0.2732
     },
     "2025": {
-      "Bioenergy": 0.0669,
-      "Coal": 0.123,
-      "Gas": 0.4108,
+      "Bioenergy": 0.0668,
+      "Coal": 0.1231,
+      "Gas": 0.4065,
       "Hydro": 0.0009,
       "Nuclear": 0.0237,
-      "Other Fossil": 0.0059,
+      "Other Fossil": 0.0105,
       "Other Renewables": 0.0043,
-      "Solar": 0.1645,
-      "Wind": 0.2
+      "Solar": 0.1644,
+      "Wind": 0.1998
     }
   },
   "NO": {
@@ -11321,14 +11321,14 @@
     },
     "2021": {
       "Bioenergy": 0.004,
-      "Coal": 0.1192,
+      "Coal": 0.1193,
       "Gas": 0.0232,
       "Hydro": 0.8072,
       "Nuclear": 0.0111,
       "Other Fossil": 0.002,
       "Other Renewables": 0.001,
       "Solar": 0.019,
-      "Wind": 0.0132
+      "Wind": 0.0131
     },
     "2022": {
       "Bioenergy": 0.0044,
@@ -11342,18 +11342,18 @@
       "Wind": 0.0145
     },
     "2023": {
-      "Bioenergy": 0.0044,
-      "Coal": 0.1175,
-      "Gas": 0.021,
+      "Bioenergy": 0.0045,
+      "Coal": 0.1174,
+      "Gas": 0.0211,
       "Hydro": 0.8042,
       "Nuclear": 0.0111,
       "Other Fossil": 0.0015,
       "Other Renewables": 0.0011,
-      "Solar": 0.0232,
+      "Solar": 0.0231,
       "Wind": 0.0159
     },
     "2024": {
-      "Bioenergy": 0.0043,
+      "Bioenergy": 0.0044,
       "Coal": 0.1139,
       "Gas": 0.0205,
       "Hydro": 0.8051,
@@ -11364,14 +11364,14 @@
       "Wind": 0.0166
     },
     "2025": {
-      "Bioenergy": 0.0044,
-      "Coal": 0.1126,
-      "Gas": 0.0205,
-      "Hydro": 0.7982,
-      "Nuclear": 0.0118,
-      "Other Fossil": 0.0014,
-      "Other Renewables": 0.0011,
-      "Solar": 0.0298,
+      "Bioenergy": 0.0045,
+      "Coal": 0.1134,
+      "Gas": 0.0206,
+      "Hydro": 0.7983,
+      "Nuclear": 0.012,
+      "Other Fossil": 0.0013,
+      "Other Renewables": 0.0012,
+      "Solar": 0.0286,
       "Wind": 0.0201
     }
   },
@@ -11602,14 +11602,14 @@
     },
     "2025": {
       "Bioenergy": 0.0008,
-      "Coal": 0.0529,
-      "Gas": 0.1362,
-      "Hydro": 0.496,
+      "Coal": 0.0532,
+      "Gas": 0.129,
+      "Hydro": 0.5044,
       "Nuclear": 0,
       "Other Fossil": 0,
-      "Other Renewables": 0.2356,
+      "Other Renewables": 0.2337,
       "Solar": 0,
-      "Wind": 0.0785
+      "Wind": 0.079
     }
   },
   "OM": {
@@ -11838,15 +11838,15 @@
       "Wind": 0.0651
     },
     "2025": {
-      "Bioenergy": 0.0053,
+      "Bioenergy": 0.0054,
       "Coal": 0,
-      "Gas": 0.3018,
-      "Hydro": 0.6137,
+      "Gas": 0.2835,
+      "Hydro": 0.6271,
       "Nuclear": 0,
-      "Other Fossil": 0.0019,
+      "Other Fossil": 0.002,
       "Other Renewables": 0,
-      "Solar": 0.0208,
-      "Wind": 0.0565
+      "Solar": 0.0225,
+      "Wind": 0.0596
     }
   },
   "PF": {
@@ -12075,15 +12075,15 @@
       "Wind": 0.01
     },
     "2025": {
-      "Bioenergy": 0.0146,
-      "Coal": 0.604,
-      "Gas": 0.1421,
-      "Hydro": 0.1066,
-      "Nuclear": 0,
-      "Other Fossil": 0.0042,
-      "Other Renewables": 0.0836,
-      "Solar": 0.0282,
-      "Wind": 0.0167
+      "Bioenergy": 0.0122,
+      "Coal": 0.5896,
+      "Gas": 0.1638,
+      "Hydro": 0.0993,
+      "Nuclear": 0,
+      "Other Fossil": 0.0051,
+      "Other Renewables": 0.079,
+      "Solar": 0.0393,
+      "Wind": 0.0117
     }
   },
   "PK": {
@@ -12549,15 +12549,15 @@
       "Wind": 0.3021
     },
     "2025": {
-      "Bioenergy": 0.0535,
-      "Coal": 0.0135,
-      "Gas": 0.1352,
-      "Hydro": 0.368,
-      "Nuclear": 0.0194,
-      "Other Fossil": 0.0055,
-      "Other Renewables": 0.0006,
-      "Solar": 0.0951,
-      "Wind": 0.3092
+      "Bioenergy": 0.0543,
+      "Coal": 0.0098,
+      "Gas": 0.1323,
+      "Hydro": 0.3746,
+      "Nuclear": 0.0133,
+      "Other Fossil": 0.0049,
+      "Other Renewables": 0.0004,
+      "Solar": 0.095,
+      "Wind": 0.3156
     }
   },
   "PY": {
@@ -12945,9 +12945,9 @@
     },
     "2025": {
       "Bioenergy": 0.0075,
-      "Coal": 0.6008,
-      "Gas": 0.0586,
-      "Hydro": 0.2797,
+      "Coal": 0.6011,
+      "Gas": 0.0585,
+      "Hydro": 0.2794,
       "Nuclear": 0.0022,
       "Other Fossil": 0.0067,
       "Other Renewables": 0.0001,
@@ -13500,12 +13500,12 @@
       "Bioenergy": 0.0418,
       "Coal": 0,
       "Gas": 0,
-      "Hydro": 0.4102,
-      "Nuclear": 0.2885,
+      "Hydro": 0.4103,
+      "Nuclear": 0.2884,
       "Other Fossil": 0,
       "Other Renewables": 0,
       "Solar": 0.008,
-      "Wind": 0.2515
+      "Wind": 0.2514
     }
   },
   "SG": {
@@ -13577,13 +13577,13 @@
     },
     "2025": {
       "Bioenergy": 0.0001,
-      "Coal": 0.0022,
-      "Gas": 0.9539,
+      "Coal": 0.0024,
+      "Gas": 0.9483,
       "Hydro": 0.0004,
-      "Nuclear": 0.0002,
-      "Other Fossil": 0.0202,
+      "Nuclear": 0.0003,
+      "Other Fossil": 0.0231,
       "Other Renewables": 0,
-      "Solar": 0.0226,
+      "Solar": 0.0251,
       "Wind": 0.0004
     }
   },
@@ -14335,10 +14335,10 @@
     "2022": {
       "Bioenergy": 0.0757,
       "Coal": 0.002,
-      "Gas": 0.1524,
+      "Gas": 0.1525,
       "Hydro": 0.3219,
       "Nuclear": 0.0012,
-      "Other Fossil": 0.0729,
+      "Other Fossil": 0.0728,
       "Other Renewables": 0.197,
       "Solar": 0.1536,
       "Wind": 0.0233
@@ -14808,7 +14808,7 @@
     },
     "2022": {
       "Bioenergy": 0.0681,
-      "Coal": 0.253,
+      "Coal": 0.2529,
       "Gas": 0.5526,
       "Hydro": 0.0522,
       "Nuclear": 0.0082,
@@ -14818,8 +14818,8 @@
       "Wind": 0.0238
     },
     "2023": {
-      "Bioenergy": 0.0675,
-      "Coal": 0.2153,
+      "Bioenergy": 0.0676,
+      "Coal": 0.2152,
       "Gas": 0.5992,
       "Hydro": 0.0466,
       "Nuclear": 0.0074,
@@ -14830,9 +14830,9 @@
     },
     "2024": {
       "Bioenergy": 0.0609,
-      "Coal": 0.2219,
+      "Coal": 0.2218,
       "Gas": 0.5978,
-      "Hydro": 0.0458,
+      "Hydro": 0.0457,
       "Nuclear": 0.0076,
       "Other Fossil": 0.0019,
       "Other Renewables": 0.0008,
@@ -14840,14 +14840,14 @@
       "Wind": 0.0268
     },
     "2025": {
-      "Bioenergy": 0.0637,
-      "Coal": 0.2214,
-      "Gas": 0.5657,
+      "Bioenergy": 0.0638,
+      "Coal": 0.2219,
+      "Gas": 0.5658,
       "Hydro": 0.0547,
-      "Nuclear": 0.0077,
-      "Other Fossil": 0.0014,
-      "Other Renewables": 0.0007,
-      "Solar": 0.0516,
+      "Nuclear": 0.0078,
+      "Other Fossil": 0.0013,
+      "Other Renewables": 0.0008,
+      "Solar": 0.0509,
       "Wind": 0.0331
     }
   },
@@ -15314,15 +15314,15 @@
       "Wind": 0.107
     },
     "2025": {
-      "Bioenergy": 0.0248,
-      "Coal": 0.3307,
-      "Gas": 0.2231,
-      "Hydro": 0.1906,
+      "Bioenergy": 0.0249,
+      "Coal": 0.3319,
+      "Gas": 0.2239,
+      "Hydro": 0.1913,
       "Nuclear": 0.0002,
-      "Other Fossil": 0.0028,
-      "Other Renewables": 0.0336,
-      "Solar": 0.0868,
-      "Wind": 0.1072
+      "Other Fossil": 0.0031,
+      "Other Renewables": 0.0337,
+      "Solar": 0.0833,
+      "Wind": 0.1076
     }
   },
   "TT": {
@@ -15789,13 +15789,13 @@
     },
     "2025": {
       "Bioenergy": 0.0104,
-      "Coal": 0.1691,
-      "Gas": 0.3657,
+      "Coal": 0.169,
+      "Gas": 0.3656,
       "Hydro": 0.0604,
       "Nuclear": 0.1782,
       "Other Fossil": 0.0085,
       "Other Renewables": 0.0041,
-      "Solar": 0.0768,
+      "Solar": 0.0769,
       "Wind": 0.1269
     }
   },
@@ -15847,7 +15847,7 @@
     "2023": {
       "Bioenergy": 0.0959,
       "Coal": 0.0049,
-      "Gas": 0.0929,
+      "Gas": 0.0928,
       "Hydro": 0.3411,
       "Nuclear": 0.0025,
       "Other Fossil": 0.0169,
@@ -15868,9 +15868,9 @@
     },
     "2025": {
       "Bioenergy": 0.1502,
-      "Coal": 0.0029,
-      "Gas": 0.0442,
-      "Hydro": 0.3967,
+      "Coal": 0.003,
+      "Gas": 0.0441,
+      "Hydro": 0.3968,
       "Nuclear": 0.0023,
       "Other Fossil": 0.018,
       "Other Renewables": 0.0006,
@@ -15910,7 +15910,7 @@
       "Other Fossil": 0.0112,
       "Other Renewables": 0.0001,
       "Solar": 0.001,
-      "Wind": 0.0012
+      "Wind": 0.0011
     },
     "2022": {
       "Bioenergy": 0.0004,
@@ -15947,13 +15947,13 @@
     },
     "2025": {
       "Bioenergy": 0.0004,
-      "Coal": 0.0698,
+      "Coal": 0.0699,
       "Gas": 0.8122,
       "Hydro": 0.1013,
-      "Nuclear": 0.0011,
+      "Nuclear": 0.0012,
       "Other Fossil": 0.0111,
       "Other Renewables": 0.0001,
-      "Solar": 0.0021,
+      "Solar": 0.002,
       "Wind": 0.0018
     }
   },
@@ -16579,14 +16579,14 @@
     },
     "2025": {
       "Bioenergy": 0.0086,
-      "Coal": 0.6946,
+      "Coal": 0.6947,
       "Gas": 0.0748,
-      "Hydro": 0.0644,
-      "Nuclear": 0.0599,
-      "Other Fossil": 0.007,
+      "Hydro": 0.0645,
+      "Nuclear": 0.06,
+      "Other Fossil": 0.0071,
       "Other Renewables": 0.002,
-      "Solar": 0.0203,
-      "Wind": 0.0682
+      "Solar": 0.0202,
+      "Wind": 0.0683
     }
   },
   "YE": {
@@ -16726,25 +16726,25 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Coal": 0.8139,
+      "Coal": 0.8145,
       "Gas": 0.0004,
       "Hydro": 0.0047,
       "Nuclear": 0.0331,
       "Other Fossil": 0.0142,
       "Other Renewables": 0.001,
-      "Solar": 0.0854,
+      "Solar": 0.0848,
       "Wind": 0.0472
     },
     "2025": {
       "Bioenergy": 0,
-      "Coal": 0.7652,
+      "Coal": 0.7859,
       "Gas": 0,
-      "Hydro": 0.0033,
-      "Nuclear": 0.0536,
-      "Other Fossil": 0.0272,
-      "Other Renewables": 0.0011,
-      "Solar": 0.1016,
-      "Wind": 0.048
+      "Hydro": 0.0039,
+      "Nuclear": 0.0418,
+      "Other Fossil": 0.0312,
+      "Other Renewables": 0.001,
+      "Solar": 0.0934,
+      "Wind": 0.0427
     }
   },
   "ZM": {