@digital4better/data 1.3.11 → 1.3.13

package/data/mix/country-yearly.json

@@ -136,24 +136,24 @@
     },
     "2024": {
       "Bioenergy": 0.0162,
-      "Coal": 0.4337,
+      "Coal": 0.4336,
       "Gas": 0.0756,
       "Hydro": 0.2844,
       "Nuclear": 0.0404,
       "Other Fossil": 0.02,
       "Other Renewables": 0.0041,
-      "Solar": 0.0689,
+      "Solar": 0.069,
       "Wind": 0.0567
     },
     "2025": {
-      "Bioenergy": 0.0156,
+      "Bioenergy": 0.0155,
       "Coal": 0.4124,
       "Gas": 0.0728,
       "Hydro": 0.278,
-      "Nuclear": 0.0426,
-      "Other Fossil": 0.02,
-      "Other Renewables": 0.0044,
-      "Solar": 0.0881,
+      "Nuclear": 0.0424,
+      "Other Fossil": 0.0202,
+      "Other Renewables": 0.0043,
+      "Solar": 0.0883,
       "Wind": 0.0659
     }
   },
@@ -304,15 +304,15 @@
       "Wind": 0.0403
     },
     "2025": {
-      "Bioenergy": 0.0087,
-      "Coal": 0.0396,
-      "Gas": 0.0733,
-      "Hydro": 0.7347,
-      "Nuclear": 0.062,
-      "Other Fossil": 0.0075,
+      "Bioenergy": 0.0088,
+      "Coal": 0.04,
+      "Gas": 0.0729,
+      "Hydro": 0.7341,
+      "Nuclear": 0.0622,
+      "Other Fossil": 0.0071,
       "Other Renewables": 0.0022,
-      "Solar": 0.0347,
-      "Wind": 0.0372
+      "Solar": 0.0353,
+      "Wind": 0.0374
     }
   },
   "AM": {
@@ -545,7 +545,7 @@
       "Coal": 0.0081,
       "Gas": 0.5309,
       "Hydro": 0.2198,
-      "Nuclear": 0.0701,
+      "Nuclear": 0.07,
       "Other Fossil": 0.0095,
       "Other Renewables": 0.0001,
       "Solar": 0.0299,
@@ -703,10 +703,10 @@
       "Coal": 0.0092,
       "Gas": 0.1233,
       "Hydro": 0.5344,
-      "Nuclear": 0.0127,
-      "Other Fossil": 0.016,
+      "Nuclear": 0.0128,
+      "Other Fossil": 0.0159,
       "Other Renewables": 0.0004,
-      "Solar": 0.151,
+      "Solar": 0.1511,
       "Wind": 0.1247
     }
   },
@@ -1016,13 +1016,13 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Coal": 0.5959,
+      "Coal": 0.593,
       "Gas": 0,
-      "Hydro": 0.3551,
+      "Hydro": 0.3534,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0338,
+      "Solar": 0.0386,
       "Wind": 0.0151
     }
   },
@@ -1163,7 +1163,7 @@
     },
     "2024": {
       "Bioenergy": 0.0033,
-      "Coal": 0.3646,
+      "Coal": 0.3645,
       "Gas": 0.4499,
       "Hydro": 0.0281,
       "Nuclear": 0.0082,
@@ -1177,7 +1177,7 @@
       "Coal": 0.3518,
       "Gas": 0.4462,
       "Hydro": 0.0229,
-      "Nuclear": 0.0091,
+      "Nuclear": 0.009,
       "Other Fossil": 0.1215,
       "Other Renewables": 0.0009,
       "Solar": 0.0303,
@@ -1253,14 +1253,14 @@
     },
     "2025": {
       "Bioenergy": 0.0125,
-      "Coal": 0.0194,
-      "Gas": 0.2026,
-      "Hydro": 0.0283,
+      "Coal": 0.0196,
+      "Gas": 0.2025,
+      "Hydro": 0.0281,
       "Nuclear": 0.3306,
-      "Other Fossil": 0.0987,
+      "Other Fossil": 0.0985,
       "Other Renewables": 0.0011,
-      "Solar": 0.1609,
-      "Wind": 0.1459
+      "Solar": 0.1612,
+      "Wind": 0.146
     }
   },
   "BF": {
@@ -2360,13 +2360,13 @@
     "2025": {
       "Bioenergy": 0.1704,
       "Coal": 0.0164,
-      "Gas": 0.0997,
-      "Hydro": 0.5163,
-      "Nuclear": 0.0085,
-      "Other Fossil": 0.1004,
+      "Gas": 0.0998,
+      "Hydro": 0.5168,
+      "Nuclear": 0.008,
+      "Other Fossil": 0.1001,
       "Other Renewables": 0.0023,
-      "Solar": 0.0448,
-      "Wind": 0.0412
+      "Solar": 0.0447,
+      "Wind": 0.0414
     }
   },
   "CA": {
@@ -2754,14 +2754,14 @@
     },
     "2025": {
       "Bioenergy": 0.0016,
-      "Coal": 0.0082,
-      "Gas": 0.0149,
-      "Hydro": 0.4948,
-      "Nuclear": 0.2997,
-      "Other Fossil": 0.0456,
+      "Coal": 0.0085,
+      "Gas": 0.0153,
+      "Hydro": 0.5008,
+      "Nuclear": 0.2888,
+      "Other Fossil": 0.0489,
       "Other Renewables": 0.0004,
-      "Solar": 0.1256,
-      "Wind": 0.0092
+      "Solar": 0.1261,
+      "Wind": 0.0096
     }
   },
   "CI": {
@@ -3140,7 +3140,7 @@
       "Bioenergy": 0.02,
       "Coal": 0.5912,
       "Gas": 0.0286,
-      "Hydro": 0.1293,
+      "Hydro": 0.1294,
       "Nuclear": 0.0449,
       "Other Fossil": 0.0017,
       "Other Renewables": 0,
@@ -3148,15 +3148,15 @@
       "Wind": 0.1001
     },
     "2025": {
-      "Bioenergy": 0.0187,
-      "Coal": 0.5522,
-      "Gas": 0.0267,
-      "Hydro": 0.1191,
-      "Nuclear": 0.0479,
+      "Bioenergy": 0.0189,
+      "Coal": 0.5563,
+      "Gas": 0.0269,
+      "Hydro": 0.1185,
+      "Nuclear": 0.0475,
       "Other Fossil": 0.0016,
       "Other Renewables": 0,
-      "Solar": 0.1177,
-      "Wind": 0.1161
+      "Solar": 0.1168,
+      "Wind": 0.1137
     }
   },
   "CO": {
@@ -3548,10 +3548,10 @@
       "Gas": 0,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": 0.7361,
+      "Other Fossil": 0.7111,
       "Other Renewables": 0,
-      "Solar": 0.2229,
-      "Wind": 0.0411
+      "Solar": 0.2493,
+      "Wind": 0.0397
     }
   },
   "CZ": {
@@ -3701,15 +3701,15 @@
       "Wind": 0.2733
     },
     "2025": {
-      "Bioenergy": 0.0806,
-      "Coal": 0.1953,
-      "Gas": 0.1623,
-      "Hydro": 0.0411,
-      "Nuclear": 0.0058,
-      "Other Fossil": 0.0692,
-      "Other Renewables": 0.0002,
-      "Solar": 0.2013,
-      "Wind": 0.2441
+      "Bioenergy": 0.0804,
+      "Coal": 0.2046,
+      "Gas": 0.1665,
+      "Hydro": 0.0422,
+      "Nuclear": 0.0072,
+      "Other Fossil": 0.0614,
+      "Other Renewables": 0.0003,
+      "Solar": 0.2035,
+      "Wind": 0.2339
     }
   },
   "DJ": {
@@ -3860,14 +3860,14 @@
     },
     "2025": {
       "Bioenergy": 0.0931,
-      "Coal": 0.0876,
-      "Gas": 0.0888,
-      "Hydro": 0.0329,
+      "Coal": 0.0879,
+      "Gas": 0.0886,
+      "Hydro": 0.0326,
       "Nuclear": 0.0372,
-      "Other Fossil": 0.0386,
+      "Other Fossil": 0.0383,
       "Other Renewables": 0.0013,
-      "Solar": 0.1485,
-      "Wind": 0.472
+      "Solar": 0.1489,
+      "Wind": 0.4721
     }
   },
   "DM": {
@@ -3985,7 +3985,7 @@
     },
     "2022": {
       "Bioenergy": 0.0098,
-      "Coal": 0.1718,
+      "Coal": 0.1717,
       "Gas": 0.2624,
       "Hydro": 0.0614,
       "Nuclear": 0,
@@ -3996,36 +3996,36 @@
     },
     "2023": {
       "Bioenergy": 0.0088,
-      "Coal": 0.3088,
-      "Gas": 0.3916,
-      "Hydro": 0.049,
+      "Coal": 0.309,
+      "Gas": 0.392,
+      "Hydro": 0.0482,
       "Nuclear": 0,
-      "Other Fossil": 0.1469,
+      "Other Fossil": 0.1468,
       "Other Renewables": 0,
-      "Solar": 0.0473,
-      "Wind": 0.0477
+      "Solar": 0.0474,
+      "Wind": 0.0478
     },
     "2024": {
       "Bioenergy": 0.0087,
-      "Coal": 0.2953,
-      "Gas": 0.4101,
-      "Hydro": 0.059,
+      "Coal": 0.2957,
+      "Gas": 0.4102,
+      "Hydro": 0.0587,
       "Nuclear": 0,
-      "Other Fossil": 0.1279,
+      "Other Fossil": 0.1276,
       "Other Renewables": 0,
-      "Solar": 0.0578,
+      "Solar": 0.0579,
       "Wind": 0.0412
     },
     "2025": {
-      "Bioenergy": 0.0112,
-      "Coal": 0.2759,
-      "Gas": 0.4131,
-      "Hydro": 0.0694,
+      "Bioenergy": 0.0106,
+      "Coal": 0.2942,
+      "Gas": 0.3897,
+      "Hydro": 0.0743,
       "Nuclear": 0,
-      "Other Fossil": 0.1005,
+      "Other Fossil": 0.0925,
       "Other Renewables": 0,
-      "Solar": 0.0813,
-      "Wind": 0.0487
+      "Solar": 0.0781,
+      "Wind": 0.0606
     }
   },
   "DZ": {
@@ -4183,7 +4183,7 @@
       "Other Fossil": 0.2361,
       "Other Renewables": 0.0002,
       "Solar": 0.0022,
-      "Wind": 0.0058
+      "Wind": 0.0059
     }
   },
   "EE": {
@@ -4243,26 +4243,26 @@
       "Wind": 0.1554
     },
     "2024": {
-      "Bioenergy": 0.0673,
+      "Bioenergy": 0.0674,
       "Coal": 0.05,
       "Gas": 0.0865,
       "Hydro": 0.0655,
       "Nuclear": 0.075,
       "Other Fossil": 0.3036,
       "Other Renewables": 0.0025,
-      "Solar": 0.1482,
+      "Solar": 0.1483,
       "Wind": 0.2013
     },
     "2025": {
       "Bioenergy": 0.0687,
-      "Coal": 0.0413,
-      "Gas": 0.0763,
-      "Hydro": 0.0538,
-      "Nuclear": 0.0633,
-      "Other Fossil": 0.2914,
+      "Coal": 0.0417,
+      "Gas": 0.0761,
+      "Hydro": 0.0533,
+      "Nuclear": 0.0634,
+      "Other Fossil": 0.291,
       "Other Renewables": 0.0022,
-      "Solar": 0.1963,
-      "Wind": 0.2066
+      "Solar": 0.1967,
+      "Wind": 0.2068
     }
   },
   "EG": {
@@ -4650,14 +4650,14 @@
     },
     "2025": {
       "Bioenergy": 0.1184,
-      "Coal": 0.0173,
-      "Gas": 0.0271,
-      "Hydro": 0.1649,
-      "Nuclear": 0.3559,
-      "Other Fossil": 0.044,
+      "Coal": 0.0174,
+      "Gas": 0.027,
+      "Hydro": 0.1648,
+      "Nuclear": 0.356,
+      "Other Fossil": 0.0439,
       "Other Renewables": 0.0032,
-      "Solar": 0.0258,
-      "Wind": 0.2434
+      "Solar": 0.0259,
+      "Wind": 0.2435
     }
   },
   "FJ": {
@@ -5124,13 +5124,13 @@
     },
     "2025": {
       "Bioenergy": 0.075,
-      "Coal": 0.0145,
-      "Gas": 0.3229,
-      "Hydro": 0.0302,
+      "Coal": 0.0147,
+      "Gas": 0.3227,
+      "Hydro": 0.03,
       "Nuclear": 0.161,
-      "Other Fossil": 0.0193,
+      "Other Fossil": 0.0192,
       "Other Renewables": 0.0008,
-      "Solar": 0.0901,
+      "Solar": 0.0903,
       "Wind": 0.2863
     }
   },
@@ -5282,14 +5282,14 @@
     },
     "2025": {
       "Bioenergy": 0.0025,
-      "Coal": 0.0634,
-      "Gas": 0.1291,
-      "Hydro": 0.7689,
-      "Nuclear": 0.0065,
+      "Coal": 0.0617,
+      "Gas": 0.1315,
+      "Hydro": 0.7691,
+      "Nuclear": 0.0064,
       "Other Fossil": 0.0007,
       "Other Renewables": 0.0006,
-      "Solar": 0.0099,
-      "Wind": 0.0181
+      "Solar": 0.0097,
+      "Wind": 0.0178
     }
   },
   "GF": {
@@ -5993,7 +5993,7 @@
     },
     "2025": {
       "Bioenergy": 0.0006,
-      "Coal": 0.0608,
+      "Coal": 0.0609,
       "Gas": 0.4169,
       "Hydro": 0.0493,
       "Nuclear": 0.0037,
@@ -6391,10 +6391,10 @@
       "Coal": 0.5572,
       "Gas": 0.3388,
       "Hydro": 0.0282,
-      "Nuclear": 0.0139,
-      "Other Fossil": 0.0051,
+      "Nuclear": 0.0138,
+      "Other Fossil": 0.0052,
       "Other Renewables": 0.0014,
-      "Solar": 0.026,
+      "Solar": 0.0261,
       "Wind": 0.0215
     }
   },
@@ -6536,7 +6536,7 @@
     "2024": {
       "Bioenergy": 0.0399,
       "Coal": 0.0738,
-      "Gas": 0.2146,
+      "Gas": 0.2145,
       "Hydro": 0.3471,
       "Nuclear": 0.0541,
       "Other Fossil": 0.0099,
@@ -6546,14 +6546,14 @@
     },
     "2025": {
       "Bioenergy": 0.0395,
-      "Coal": 0.0445,
-      "Gas": 0.1891,
-      "Hydro": 0.3293,
-      "Nuclear": 0.0598,
-      "Other Fossil": 0.0108,
+      "Coal": 0.0449,
+      "Gas": 0.1888,
+      "Hydro": 0.3287,
+      "Nuclear": 0.06,
+      "Other Fossil": 0.0104,
       "Other Renewables": 0.0168,
-      "Solar": 0.1091,
-      "Wind": 0.2011
+      "Solar": 0.1096,
+      "Wind": 0.2013
     }
   },
   "HT": {
@@ -6703,15 +6703,15 @@
       "Wind": 0.0447
     },
     "2025": {
-      "Bioenergy": 0.0364,
-      "Coal": 0.0587,
-      "Gas": 0.1857,
+      "Bioenergy": 0.0367,
+      "Coal": 0.0593,
+      "Gas": 0.1869,
       "Hydro": 0.0349,
-      "Nuclear": 0.3618,
+      "Nuclear": 0.3647,
       "Other Fossil": 0.0174,
       "Other Renewables": 0.0038,
-      "Solar": 0.2665,
-      "Wind": 0.0348
+      "Solar": 0.2611,
+      "Wind": 0.0352
     }
   },
   "ID": {
@@ -6862,14 +6862,14 @@
     },
     "2025": {
       "Bioenergy": 0.0089,
-      "Coal": 0.0478,
-      "Gas": 0.4132,
-      "Hydro": 0.0498,
-      "Nuclear": 0.0393,
-      "Other Fossil": 0.0404,
+      "Coal": 0.0481,
+      "Gas": 0.4129,
+      "Hydro": 0.0494,
+      "Nuclear": 0.0394,
+      "Other Fossil": 0.0401,
       "Other Renewables": 0.0014,
-      "Solar": 0.0565,
-      "Wind": 0.3427
+      "Solar": 0.0569,
+      "Wind": 0.3428
     }
   },
   "IL": {
@@ -7335,15 +7335,15 @@
       "Wind": 0.0964
     },
     "2025": {
-      "Bioenergy": 0.0492,
-      "Coal": 0.03,
-      "Gas": 0.4248,
-      "Hydro": 0.1593,
-      "Nuclear": 0.0304,
-      "Other Fossil": 0.0282,
-      "Other Renewables": 0.0193,
-      "Solar": 0.1589,
-      "Wind": 0.0998
+      "Bioenergy": 0.05,
+      "Coal": 0.0322,
+      "Gas": 0.4214,
+      "Hydro": 0.1423,
+      "Nuclear": 0.0334,
+      "Other Fossil": 0.0204,
+      "Other Renewables": 0.0195,
+      "Solar": 0.183,
+      "Wind": 0.0978
     }
   },
   "JM": {
@@ -7572,15 +7572,15 @@
       "Wind": 0.0198
     },
     "2025": {
-      "Bioenergy": 0.0661,
-      "Coal": 0.2703,
-      "Gas": 0.2877,
-      "Hydro": 0.0827,
-      "Nuclear": 0.1035,
-      "Other Fossil": 0.0299,
+      "Bioenergy": 0.065,
+      "Coal": 0.2646,
+      "Gas": 0.2891,
+      "Hydro": 0.083,
+      "Nuclear": 0.1032,
+      "Other Fossil": 0.0338,
       "Other Renewables": 0.0114,
-      "Solar": 0.1208,
-      "Wind": 0.0275
+      "Solar": 0.1238,
+      "Wind": 0.0261
     }
   },
   "KE": {
@@ -7813,8 +7813,8 @@
       "Coal": 0.456,
       "Gas": 0.0239,
       "Hydro": 0.3788,
-      "Nuclear": 0.014,
-      "Other Fossil": 0.0551,
+      "Nuclear": 0.0139,
+      "Other Fossil": 0.0552,
       "Other Renewables": 0.0014,
       "Solar": 0.0358,
       "Wind": 0.0216
@@ -8204,15 +8204,15 @@
       "Wind": 0.0057
     },
     "2025": {
-      "Bioenergy": 0.0211,
-      "Coal": 0.225,
-      "Gas": 0.2906,
+      "Bioenergy": 0.0204,
+      "Coal": 0.2418,
+      "Gas": 0.2853,
       "Hydro": 0.0066,
-      "Nuclear": 0.3535,
+      "Nuclear": 0.344,
       "Other Fossil": 0.0079,
-      "Other Renewables": 0.0164,
-      "Solar": 0.0715,
-      "Wind": 0.0073
+      "Other Renewables": 0.016,
+      "Solar": 0.0712,
+      "Wind": 0.0069
     }
   },
   "KW": {
@@ -8442,14 +8442,14 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Coal": 0.538,
-      "Gas": 0.2915,
-      "Hydro": 0.0944,
+      "Coal": 0.54,
+      "Gas": 0.2925,
+      "Hydro": 0.0932,
       "Nuclear": 0,
       "Other Fossil": 0.0147,
       "Other Renewables": 0,
-      "Solar": 0.0186,
-      "Wind": 0.0428
+      "Solar": 0.0183,
+      "Wind": 0.0413
     }
   },
   "LA": {
@@ -8995,14 +8995,14 @@
     },
     "2025": {
       "Bioenergy": 0.0197,
-      "Coal": 0.0341,
-      "Gas": 0.2094,
-      "Hydro": 0.0646,
-      "Nuclear": 0.0505,
-      "Other Fossil": 0.1018,
-      "Other Renewables": 0.0017,
-      "Solar": 0.1835,
-      "Wind": 0.3346
+      "Coal": 0.0345,
+      "Gas": 0.2092,
+      "Hydro": 0.0642,
+      "Nuclear": 0.0506,
+      "Other Fossil": 0.1015,
+      "Other Renewables": 0.0018,
+      "Solar": 0.1837,
+      "Wind": 0.3348
     }
   },
   "LU": {
@@ -9063,7 +9063,7 @@
     },
     "2024": {
       "Bioenergy": 0.0734,
-      "Coal": 0.0969,
+      "Coal": 0.0968,
       "Gas": 0.1813,
       "Hydro": 0.1556,
       "Nuclear": 0.1476,
@@ -9073,15 +9073,15 @@
       "Wind": 0.1855
     },
     "2025": {
-      "Bioenergy": 0.0686,
-      "Coal": 0.0908,
-      "Gas": 0.1817,
-      "Hydro": 0.1309,
-      "Nuclear": 0.1399,
-      "Other Fossil": 0.0413,
+      "Bioenergy": 0.0687,
+      "Coal": 0.0916,
+      "Gas": 0.1809,
+      "Hydro": 0.1297,
+      "Nuclear": 0.1403,
+      "Other Fossil": 0.0405,
       "Other Renewables": 0.005,
-      "Solar": 0.1699,
-      "Wind": 0.1718
+      "Solar": 0.171,
+      "Wind": 0.1723
     }
   },
   "LV": {
@@ -9153,14 +9153,14 @@
     },
     "2025": {
       "Bioenergy": 0.0589,
-      "Coal": 0.0153,
-      "Gas": 0.2432,
-      "Hydro": 0.4932,
+      "Coal": 0.0155,
+      "Gas": 0.243,
+      "Hydro": 0.4929,
       "Nuclear": 0.0254,
-      "Other Fossil": 0.0081,
+      "Other Fossil": 0.0079,
       "Other Renewables": 0.0009,
-      "Solar": 0.1109,
-      "Wind": 0.044
+      "Solar": 0.1112,
+      "Wind": 0.0441
     }
   },
   "LY": {
@@ -9392,12 +9392,12 @@
       "Bioenergy": 0.0006,
       "Coal": 0.0026,
       "Gas": 0.9215,
-      "Hydro": 0.0453,
+      "Hydro": 0.0452,
       "Nuclear": 0.0041,
       "Other Fossil": 0.0005,
       "Other Renewables": 0.0001,
       "Solar": 0.023,
-      "Wind": 0.0024
+      "Wind": 0.0025
     }
   },
   "ME": {
@@ -9468,15 +9468,15 @@
       "Wind": 0.0916
     },
     "2025": {
-      "Bioenergy": 0.0132,
-      "Coal": 0.2119,
-      "Gas": 0.1039,
-      "Hydro": 0.3583,
-      "Nuclear": 0.0938,
-      "Other Fossil": 0.0113,
+      "Bioenergy": 0.0131,
+      "Coal": 0.2103,
+      "Gas": 0.1024,
+      "Hydro": 0.3531,
+      "Nuclear": 0.0928,
+      "Other Fossil": 0.0104,
       "Other Renewables": 0.0034,
-      "Solar": 0.0768,
-      "Wind": 0.1274
+      "Solar": 0.0883,
+      "Wind": 0.1263
     }
   },
   "MG": {
@@ -9616,7 +9616,7 @@
     },
     "2024": {
       "Bioenergy": 0.0191,
-      "Coal": 0.3935,
+      "Coal": 0.3934,
       "Gas": 0.2329,
       "Hydro": 0.2409,
       "Nuclear": 0.0182,
@@ -9627,14 +9627,14 @@
     },
     "2025": {
       "Bioenergy": 0.0082,
-      "Coal": 0.3997,
-      "Gas": 0.2659,
-      "Hydro": 0.1736,
-      "Nuclear": 0.0457,
-      "Other Fossil": 0.0055,
+      "Coal": 0.4,
+      "Gas": 0.2656,
+      "Hydro": 0.1731,
+      "Nuclear": 0.0458,
+      "Other Fossil": 0.0052,
       "Other Renewables": 0.0016,
-      "Solar": 0.0476,
-      "Wind": 0.0523
+      "Solar": 0.048,
+      "Wind": 0.0525
     }
   },
   "ML": {
@@ -9932,7 +9932,7 @@
     },
     "2024": {
       "Bioenergy": 0.0558,
-      "Coal": 0.4675,
+      "Coal": 0.4674,
       "Gas": 0.1612,
       "Hydro": 0.1031,
       "Nuclear": 0.0448,
@@ -9944,12 +9944,12 @@
     "2025": {
       "Bioenergy": 0.0551,
       "Coal": 0.4439,
-      "Gas": 0.1582,
+      "Gas": 0.1581,
       "Hydro": 0.096,
-      "Nuclear": 0.0473,
-      "Other Fossil": 0.034,
-      "Other Renewables": 0.0049,
-      "Solar": 0.0874,
+      "Nuclear": 0.0471,
+      "Other Fossil": 0.0343,
+      "Other Renewables": 0.0048,
+      "Solar": 0.0876,
       "Wind": 0.0732
     }
   },
@@ -10252,21 +10252,21 @@
       "Gas": 0.7038,
       "Hydro": 0.0406,
       "Nuclear": 0.046,
-      "Other Fossil": 0.007,
+      "Other Fossil": 0.0071,
       "Other Renewables": 0.0016,
       "Solar": 0.1369,
       "Wind": 0.0281
     },
     "2025": {
-      "Bioenergy": 0.0064,
-      "Coal": 0.0292,
-      "Gas": 0.6784,
-      "Hydro": 0.0392,
-      "Nuclear": 0.0454,
-      "Other Fossil": 0.0142,
+      "Bioenergy": 0.0062,
+      "Coal": 0.0287,
+      "Gas": 0.6736,
+      "Hydro": 0.0378,
+      "Nuclear": 0.0444,
+      "Other Fossil": 0.0136,
       "Other Renewables": 0.0016,
-      "Solar": 0.1581,
-      "Wind": 0.0275
+      "Solar": 0.1672,
+      "Wind": 0.0269
     }
   },
   "MU": {
@@ -10574,15 +10574,15 @@
       "Wind": 0.0568
     },
     "2025": {
-      "Bioenergy": 0.0004,
-      "Coal": 0.0837,
-      "Gas": 0.6016,
-      "Hydro": 0.066,
-      "Nuclear": 0.0264,
-      "Other Fossil": 0.0923,
+      "Bioenergy": 0.0003,
+      "Coal": 0.0773,
+      "Gas": 0.5979,
+      "Hydro": 0.0724,
+      "Nuclear": 0.0284,
+      "Other Fossil": 0.0917,
       "Other Renewables": 0.0095,
-      "Solar": 0.0582,
-      "Wind": 0.0619
+      "Solar": 0.057,
+      "Wind": 0.0656
     }
   },
   "MY": {
@@ -11113,7 +11113,7 @@
       "Other Fossil": 0.3988,
       "Other Renewables": 0.1562,
       "Solar": 0.011,
-      "Wind": 0.1534
+      "Wind": 0.1535
     },
     "2024": {
       "Bioenergy": 0.1685,
@@ -11130,9 +11130,9 @@
       "Bioenergy": 0.1684,
       "Coal": 0.0033,
       "Gas": 0.0203,
-      "Hydro": 0.0853,
-      "Nuclear": 0.0017,
-      "Other Fossil": 0.3978,
+      "Hydro": 0.0855,
+      "Nuclear": 0.0016,
+      "Other Fossil": 0.3977,
       "Other Renewables": 0.1562,
       "Solar": 0.0129,
       "Wind": 0.1541
@@ -11195,26 +11195,26 @@
       "Wind": 0.2436
     },
     "2024": {
-      "Bioenergy": 0.0505,
-      "Coal": 0.0606,
-      "Gas": 0.3586,
+      "Bioenergy": 0.0508,
+      "Coal": 0.0589,
+      "Gas": 0.3574,
       "Hydro": 0.0017,
-      "Nuclear": 0.0281,
-      "Other Fossil": 0.0216,
-      "Other Renewables": 0.0145,
-      "Solar": 0.1992,
-      "Wind": 0.2651
+      "Nuclear": 0.028,
+      "Other Fossil": 0.0225,
+      "Other Renewables": 0.0153,
+      "Solar": 0.2005,
+      "Wind": 0.2649
     },
     "2025": {
-      "Bioenergy": 0.0476,
-      "Coal": 0.0703,
-      "Gas": 0.3191,
+      "Bioenergy": 0.0487,
+      "Coal": 0.0743,
+      "Gas": 0.3331,
       "Hydro": 0.0003,
-      "Nuclear": 0.0258,
-      "Other Fossil": 0.0222,
-      "Other Renewables": 0.014,
-      "Solar": 0.2791,
-      "Wind": 0.2215
+      "Nuclear": 0.0257,
+      "Other Fossil": 0.0221,
+      "Other Renewables": 0.0139,
+      "Solar": 0.2722,
+      "Wind": 0.2097
     }
   },
   "NO": {
@@ -11602,14 +11602,14 @@
     },
     "2025": {
       "Bioenergy": 0.0004,
-      "Coal": 0.0423,
-      "Gas": 0.1224,
-      "Hydro": 0.5216,
+      "Coal": 0.0414,
+      "Gas": 0.1176,
+      "Hydro": 0.5338,
       "Nuclear": 0,
       "Other Fossil": 0,
-      "Other Renewables": 0.2283,
+      "Other Renewables": 0.2262,
       "Solar": 0,
-      "Wind": 0.085
+      "Wind": 0.0806
     }
   },
   "OM": {
@@ -11838,15 +11838,15 @@
       "Wind": 0.0651
     },
     "2025": {
-      "Bioenergy": 0.0054,
+      "Bioenergy": 0.0053,
       "Coal": 0,
-      "Gas": 0.3102,
-      "Hydro": 0.596,
+      "Gas": 0.3239,
+      "Hydro": 0.5834,
       "Nuclear": 0,
       "Other Fossil": 0.0014,
       "Other Renewables": 0,
-      "Solar": 0.0252,
-      "Wind": 0.0619
+      "Solar": 0.0256,
+      "Wind": 0.0603
     }
   },
   "PF": {
@@ -12550,14 +12550,14 @@
     },
     "2025": {
       "Bioenergy": 0.0539,
-      "Coal": 0.015,
-      "Gas": 0.1593,
-      "Hydro": 0.2962,
+      "Coal": 0.0153,
+      "Gas": 0.1594,
+      "Hydro": 0.2961,
       "Nuclear": 0.0247,
-      "Other Fossil": 0.0067,
+      "Other Fossil": 0.0065,
       "Other Renewables": 0.0009,
-      "Solar": 0.1803,
-      "Wind": 0.263
+      "Solar": 0.1799,
+      "Wind": 0.2633
     }
   },
   "PY": {
@@ -12866,14 +12866,14 @@
     },
     "2025": {
       "Bioenergy": 0.0108,
-      "Coal": 0.1345,
-      "Gas": 0.1799,
-      "Hydro": 0.2388,
+      "Coal": 0.1346,
+      "Gas": 0.1798,
+      "Hydro": 0.2386,
       "Nuclear": 0.1954,
-      "Other Fossil": 0.0022,
+      "Other Fossil": 0.002,
       "Other Renewables": 0.0006,
-      "Solar": 0.1211,
-      "Wind": 0.1168
+      "Solar": 0.1212,
+      "Wind": 0.1169
     }
   },
   "RS": {
@@ -12945,14 +12945,14 @@
     },
     "2025": {
       "Bioenergy": 0.0092,
-      "Coal": 0.6169,
-      "Gas": 0.0564,
-      "Hydro": 0.2604,
-      "Nuclear": 0.0056,
+      "Coal": 0.617,
+      "Gas": 0.0563,
+      "Hydro": 0.2603,
+      "Nuclear": 0.0057,
       "Other Fossil": 0.0071,
       "Other Renewables": 0.0002,
-      "Solar": 0.0036,
-      "Wind": 0.0405
+      "Solar": 0.0037,
+      "Wind": 0.0406
     }
   },
   "RU": {
@@ -13577,14 +13577,14 @@
     },
     "2025": {
       "Bioenergy": 0.0001,
-      "Coal": 0.0021,
-      "Gas": 0.9516,
-      "Hydro": 0.0005,
-      "Nuclear": 0.0002,
-      "Other Fossil": 0.021,
+      "Coal": 0.0025,
+      "Gas": 0.9401,
+      "Hydro": 0.0006,
+      "Nuclear": 0.0003,
+      "Other Fossil": 0.03,
       "Other Renewables": 0,
-      "Solar": 0.024,
-      "Wind": 0.0003
+      "Solar": 0.026,
+      "Wind": 0.0004
     }
   },
   "SH": {
@@ -13734,15 +13734,15 @@
       "Wind": 0.0022
     },
     "2025": {
-      "Bioenergy": 0.0086,
-      "Coal": 0.1302,
-      "Gas": 0.0569,
-      "Hydro": 0.2895,
-      "Nuclear": 0.426,
+      "Bioenergy": 0.0084,
+      "Coal": 0.1276,
+      "Gas": 0.0559,
+      "Hydro": 0.2844,
+      "Nuclear": 0.4185,
       "Other Fossil": 0.0001,
       "Other Renewables": 0,
-      "Solar": 0.0883,
-      "Wind": 0.0005
+      "Solar": 0.1045,
+      "Wind": 0.0004
     }
   },
   "SK": {
@@ -14369,11 +14369,11 @@
       "Bioenergy": 0.1521,
       "Coal": 0.0023,
       "Gas": 0.2264,
-      "Hydro": 0.1794,
+      "Hydro": 0.1795,
       "Nuclear": 0.0012,
-      "Other Fossil": 0.0336,
+      "Other Fossil": 0.0335,
       "Other Renewables": 0.1973,
-      "Solar": 0.1564,
+      "Solar": 0.1563,
       "Wind": 0.0514
     }
   },
@@ -14844,10 +14844,10 @@
       "Coal": 0.1991,
       "Gas": 0.6014,
       "Hydro": 0.0504,
-      "Nuclear": 0.0066,
-      "Other Fossil": 0.0007,
+      "Nuclear": 0.0065,
+      "Other Fossil": 0.0008,
       "Other Renewables": 0.0007,
-      "Solar": 0.0566,
+      "Solar": 0.0567,
       "Wind": 0.0256
     }
   },
@@ -15314,15 +15314,15 @@
       "Wind": 0.1071
     },
     "2025": {
-      "Bioenergy": 0.0251,
-      "Coal": 0.3265,
-      "Gas": 0.1879,
-      "Hydro": 0.1968,
+      "Bioenergy": 0.0242,
+      "Coal": 0.3237,
+      "Gas": 0.2052,
+      "Hydro": 0.1938,
       "Nuclear": 0.0003,
-      "Other Fossil": 0.0032,
-      "Other Renewables": 0.0317,
-      "Solar": 0.1136,
-      "Wind": 0.1151
+      "Other Fossil": 0.0031,
+      "Other Renewables": 0.0305,
+      "Solar": 0.1094,
+      "Wind": 0.1097
     }
   },
   "TT": {
@@ -15791,7 +15791,7 @@
       "Bioenergy": 0.01,
       "Coal": 0.1656,
       "Gas": 0.3885,
-      "Hydro": 0.0565,
+      "Hydro": 0.0566,
       "Nuclear": 0.172,
       "Other Fossil": 0.0083,
       "Other Renewables": 0.0039,
@@ -16578,15 +16578,15 @@
       "Wind": 0.0647
     },
     "2025": {
-      "Bioenergy": 0.0066,
-      "Coal": 0.6905,
-      "Gas": 0.0578,
-      "Hydro": 0.0853,
-      "Nuclear": 0.0469,
-      "Other Fossil": 0.0055,
+      "Bioenergy": 0.0067,
+      "Coal": 0.7002,
+      "Gas": 0.0582,
+      "Hydro": 0.0818,
+      "Nuclear": 0.0475,
+      "Other Fossil": 0.0054,
       "Other Renewables": 0.0017,
-      "Solar": 0.0201,
-      "Wind": 0.0856
+      "Solar": 0.0204,
+      "Wind": 0.0782
     }
   },
   "YE": {
@@ -16737,14 +16737,14 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Coal": 0.7999,
+      "Coal": 0.8011,
       "Gas": 0,
-      "Hydro": 0.0099,
-      "Nuclear": 0.0398,
-      "Other Fossil": 0.0217,
-      "Other Renewables": 0.0006,
-      "Solar": 0.0827,
-      "Wind": 0.0452
+      "Hydro": 0.0087,
+      "Nuclear": 0.0394,
+      "Other Fossil": 0.0219,
+      "Other Renewables": 0.0009,
+      "Solar": 0.0809,
+      "Wind": 0.047
     }
   },
   "ZM": {