@digital4better/data 1.3.2 → 1.3.4

package/data/mix/country-yearly.json

@@ -146,15 +146,15 @@
       "Wind": 0.0567
     },
     "2025": {
-      "Bioenergy": 0.0162,
-      "Coal": 0.4234,
-      "Gas": 0.0749,
-      "Hydro": 0.2625,
-      "Nuclear": 0.0445,
-      "Other Fossil": 0.0203,
-      "Other Renewables": 0.0043,
-      "Solar": 0.0834,
-      "Wind": 0.0706
+      "Bioenergy": 0.016,
+      "Coal": 0.4208,
+      "Gas": 0.0745,
+      "Hydro": 0.2633,
+      "Nuclear": 0.0447,
+      "Other Fossil": 0.0202,
+      "Other Renewables": 0.0044,
+      "Solar": 0.0851,
+      "Wind": 0.071
     }
   },
   "AG": {
@@ -305,14 +305,14 @@
     },
     "2025": {
       "Bioenergy": 0.0092,
-      "Coal": 0.0426,
-      "Gas": 0.0754,
-      "Hydro": 0.734,
-      "Nuclear": 0.0623,
-      "Other Fossil": 0.0075,
+      "Coal": 0.0411,
+      "Gas": 0.0734,
+      "Hydro": 0.7353,
+      "Nuclear": 0.0619,
+      "Other Fossil": 0.0074,
       "Other Renewables": 0.0021,
-      "Solar": 0.0286,
-      "Wind": 0.0383
+      "Solar": 0.0314,
+      "Wind": 0.0381
     }
   },
   "AM": {
@@ -385,12 +385,12 @@
     "2025": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.3463,
+      "Gas": 0.3462,
       "Hydro": 0.2098,
       "Nuclear": 0.3829,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.061,
+      "Solar": 0.0611,
       "Wind": 0
     }
   },
@@ -541,15 +541,15 @@
       "Wind": 0.1137
     },
     "2025": {
-      "Bioenergy": 0.0094,
-      "Coal": 0.0049,
-      "Gas": 0.5589,
-      "Hydro": 0.1917,
-      "Nuclear": 0.0731,
-      "Other Fossil": 0.0088,
+      "Bioenergy": 0.0097,
+      "Coal": 0.0047,
+      "Gas": 0.5525,
+      "Hydro": 0.1932,
+      "Nuclear": 0.0752,
+      "Other Fossil": 0.0084,
       "Other Renewables": 0.0001,
-      "Solar": 0.0331,
-      "Wind": 0.1201
+      "Solar": 0.0332,
+      "Wind": 0.123
     }
   },
   "AS": {
@@ -700,14 +700,14 @@
     },
     "2025": {
       "Bioenergy": 0.0325,
-      "Coal": 0.013,
-      "Gas": 0.1687,
-      "Hydro": 0.4878,
-      "Nuclear": 0.0178,
+      "Coal": 0.0112,
+      "Gas": 0.1437,
+      "Hydro": 0.5119,
+      "Nuclear": 0.0155,
       "Other Fossil": 0.0166,
-      "Other Renewables": 0.0006,
-      "Solar": 0.131,
-      "Wind": 0.1319
+      "Other Renewables": 0.0005,
+      "Solar": 0.1408,
+      "Wind": 0.1273
     }
   },
   "AU": {
@@ -778,15 +778,15 @@
       "Wind": 0.1343
     },
     "2025": {
-      "Bioenergy": 0.0009,
-      "Coal": 0.5235,
-      "Gas": 0.0648,
-      "Hydro": 0.0503,
+      "Bioenergy": 0.0008,
+      "Coal": 0.5273,
+      "Gas": 0.0667,
+      "Hydro": 0.0525,
       "Nuclear": 0,
       "Other Fossil": 0.0001,
       "Other Renewables": 0,
-      "Solar": 0.22,
-      "Wind": 0.1405
+      "Solar": 0.2105,
+      "Wind": 0.142
     }
   },
   "AW": {
@@ -941,7 +941,7 @@
       "Gas": 0.8711,
       "Hydro": 0.1015,
       "Nuclear": 0,
-      "Other Fossil": 0.0091,
+      "Other Fossil": 0.0092,
       "Other Renewables": 0,
       "Solar": 0.0183,
       "Wind": 0
@@ -1016,14 +1016,14 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Coal": 0.5953,
+      "Coal": 0.5922,
       "Gas": 0,
-      "Hydro": 0.365,
+      "Hydro": 0.3654,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.024,
-      "Wind": 0.0157
+      "Solar": 0.0269,
+      "Wind": 0.0156
     }
   },
   "BB": {
@@ -1174,13 +1174,13 @@
     },
     "2025": {
       "Bioenergy": 0.0034,
-      "Coal": 0.3575,
-      "Gas": 0.4317,
-      "Hydro": 0.015,
+      "Coal": 0.3549,
+      "Gas": 0.4322,
+      "Hydro": 0.0151,
       "Nuclear": 0.0094,
-      "Other Fossil": 0.1366,
+      "Other Fossil": 0.1384,
       "Other Renewables": 0.0009,
-      "Solar": 0.0305,
+      "Solar": 0.0309,
       "Wind": 0.0149
     }
   },
@@ -1253,14 +1253,14 @@
     },
     "2025": {
       "Bioenergy": 0.0123,
-      "Coal": 0.02,
-      "Gas": 0.2128,
-      "Hydro": 0.0275,
-      "Nuclear": 0.3476,
-      "Other Fossil": 0.0999,
+      "Coal": 0.0194,
+      "Gas": 0.2007,
+      "Hydro": 0.0277,
+      "Nuclear": 0.3416,
+      "Other Fossil": 0.0998,
       "Other Renewables": 0.001,
-      "Solar": 0.1341,
-      "Wind": 0.1448
+      "Solar": 0.1484,
+      "Wind": 0.1491
     }
   },
   "BF": {
@@ -1410,15 +1410,15 @@
       "Wind": 0.0411
     },
     "2025": {
-      "Bioenergy": 0.0031,
-      "Coal": 0.2995,
-      "Gas": 0.0572,
-      "Hydro": 0.0693,
-      "Nuclear": 0.3978,
+      "Bioenergy": 0.0033,
+      "Coal": 0.2843,
+      "Gas": 0.0566,
+      "Hydro": 0.0784,
+      "Nuclear": 0.3887,
       "Other Fossil": 0.0001,
       "Other Renewables": 0,
-      "Solar": 0.1382,
-      "Wind": 0.0348
+      "Solar": 0.1536,
+      "Wind": 0.0349
     }
   },
   "BH": {
@@ -1886,13 +1886,13 @@
     "2025": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.6,
-      "Hydro": 0.3546,
+      "Gas": 0.5931,
+      "Hydro": 0.3604,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0289,
-      "Wind": 0.0165
+      "Solar": 0.0293,
+      "Wind": 0.0173
     }
   },
   "BR": {
@@ -1963,15 +1963,15 @@
       "Wind": 0.1521
     },
     "2025": {
-      "Bioenergy": 0.0076,
-      "Coal": 0.0088,
-      "Gas": 0.0395,
-      "Hydro": 0.658,
-      "Nuclear": 0.0205,
+      "Bioenergy": 0.0089,
+      "Coal": 0.009,
+      "Gas": 0.0421,
+      "Hydro": 0.6467,
+      "Nuclear": 0.02,
       "Other Fossil": 0.0098,
       "Other Renewables": 0,
-      "Solar": 0.1252,
-      "Wind": 0.1305
+      "Solar": 0.1247,
+      "Wind": 0.1388
     }
   },
   "BS": {
@@ -2282,9 +2282,9 @@
       "Bioenergy": 0.0154,
       "Coal": 0.0002,
       "Gas": 0.5813,
-      "Hydro": 0.0105,
+      "Hydro": 0.0104,
       "Nuclear": 0.314,
-      "Other Fossil": 0.0706,
+      "Other Fossil": 0.0708,
       "Other Renewables": 0,
       "Solar": 0.0026,
       "Wind": 0.0053
@@ -2358,15 +2358,15 @@
       "Wind": 0.041
     },
     "2025": {
-      "Bioenergy": 0.1698,
-      "Coal": 0.0137,
-      "Gas": 0.0948,
-      "Hydro": 0.5261,
-      "Nuclear": 0.0086,
+      "Bioenergy": 0.1699,
+      "Coal": 0.0139,
+      "Gas": 0.0952,
+      "Hydro": 0.5252,
+      "Nuclear": 0.0084,
       "Other Fossil": 0.1004,
       "Other Renewables": 0.0023,
       "Solar": 0.0468,
-      "Wind": 0.0376
+      "Wind": 0.0379
     }
   },
   "CA": {
@@ -2437,15 +2437,15 @@
       "Wind": 0.0757
     },
     "2025": {
-      "Bioenergy": 0.0161,
-      "Coal": 0.0364,
-      "Gas": 0.1479,
-      "Hydro": 0.5798,
-      "Nuclear": 0.1186,
+      "Bioenergy": 0.016,
+      "Coal": 0.0363,
+      "Gas": 0.1472,
+      "Hydro": 0.5786,
+      "Nuclear": 0.1195,
       "Other Fossil": 0.0078,
       "Other Renewables": 0.0007,
-      "Solar": 0.007,
-      "Wind": 0.0859
+      "Solar": 0.0074,
+      "Wind": 0.0867
     }
   },
   "CD": {
@@ -2753,15 +2753,15 @@
       "Wind": 0.0046
     },
     "2025": {
-      "Bioenergy": 0.0023,
-      "Coal": 0.012,
-      "Gas": 0.021,
-      "Hydro": 0.4617,
-      "Nuclear": 0.3309,
-      "Other Fossil": 0.0512,
-      "Other Renewables": 0.0005,
-      "Solar": 0.1077,
-      "Wind": 0.0127
+      "Bioenergy": 0.002,
+      "Coal": 0.0101,
+      "Gas": 0.0177,
+      "Hydro": 0.4809,
+      "Nuclear": 0.3097,
+      "Other Fossil": 0.0496,
+      "Other Renewables": 0.0004,
+      "Solar": 0.1186,
+      "Wind": 0.011
     }
   },
   "CI": {
@@ -2990,15 +2990,15 @@
       "Wind": 0.1296
     },
     "2025": {
-      "Bioenergy": 0.0252,
-      "Coal": 0.1628,
-      "Gas": 0.1776,
-      "Hydro": 0.2472,
+      "Bioenergy": 0.0256,
+      "Coal": 0.1688,
+      "Gas": 0.1778,
+      "Hydro": 0.2504,
       "Nuclear": 0,
       "Other Fossil": 0.0149,
       "Other Renewables": 0.0014,
-      "Solar": 0.2374,
-      "Wind": 0.1336
+      "Solar": 0.2283,
+      "Wind": 0.1327
     }
   },
   "CM": {
@@ -3148,15 +3148,15 @@
       "Wind": 0.1001
     },
     "2025": {
-      "Bioenergy": 0.0192,
-      "Coal": 0.5661,
-      "Gas": 0.0274,
-      "Hydro": 0.1014,
-      "Nuclear": 0.0492,
+      "Bioenergy": 0.019,
+      "Coal": 0.5602,
+      "Gas": 0.0271,
+      "Hydro": 0.1052,
+      "Nuclear": 0.049,
       "Other Fossil": 0.0016,
       "Other Renewables": 0,
-      "Solar": 0.108,
-      "Wind": 0.1271
+      "Solar": 0.1115,
+      "Wind": 0.1265
     }
   },
   "CO": {
@@ -3228,14 +3228,14 @@
     },
     "2025": {
       "Bioenergy": 0.0001,
-      "Coal": 0.0577,
-      "Gas": 0.0698,
-      "Hydro": 0.8097,
+      "Coal": 0.052,
+      "Gas": 0.0693,
+      "Hydro": 0.8172,
       "Nuclear": 0.0003,
-      "Other Fossil": 0.0076,
+      "Other Fossil": 0.0075,
       "Other Renewables": 0.0001,
-      "Solar": 0.052,
-      "Wind": 0.0027
+      "Solar": 0.0511,
+      "Wind": 0.0025
     }
   },
   "CR": {
@@ -3306,15 +3306,15 @@
       "Wind": 0.098
     },
     "2025": {
-      "Bioenergy": 0.0073,
+      "Bioenergy": 0.006,
       "Coal": 0.0005,
-      "Gas": 0.0037,
-      "Hydro": 0.6975,
-      "Nuclear": 0.0004,
-      "Other Fossil": 0.0251,
-      "Other Renewables": 0.1145,
-      "Solar": 0.0015,
-      "Wind": 0.1495
+      "Gas": 0.0031,
+      "Hydro": 0.7135,
+      "Nuclear": 0.0003,
+      "Other Fossil": 0.0208,
+      "Other Renewables": 0.115,
+      "Solar": 0.0012,
+      "Wind": 0.1396
     }
   },
   "CU": {
@@ -3548,10 +3548,10 @@
       "Gas": 0,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": 0.7689,
+      "Other Fossil": 0.7651,
       "Other Renewables": 0,
-      "Solar": 0.1912,
-      "Wind": 0.0399
+      "Solar": 0.1946,
+      "Wind": 0.0403
     }
   },
   "CZ": {
@@ -3622,14 +3622,14 @@
       "Wind": 0.0103
     },
     "2025": {
-      "Bioenergy": 0.0379,
-      "Coal": 0.3681,
-      "Gas": 0.0622,
-      "Hydro": 0.0251,
-      "Nuclear": 0.3978,
-      "Other Fossil": 0.0092,
-      "Other Renewables": 0.0306,
-      "Solar": 0.0618,
+      "Bioenergy": 0.0393,
+      "Coal": 0.347,
+      "Gas": 0.0613,
+      "Hydro": 0.0247,
+      "Nuclear": 0.411,
+      "Other Fossil": 0.0089,
+      "Other Renewables": 0.0313,
+      "Solar": 0.0693,
       "Wind": 0.0073
     }
   },
@@ -3701,15 +3701,15 @@
       "Wind": 0.2727
     },
     "2025": {
-      "Bioenergy": 0.0825,
-      "Coal": 0.2278,
-      "Gas": 0.1647,
-      "Hydro": 0.0379,
-      "Nuclear": 0.0066,
+      "Bioenergy": 0.083,
+      "Coal": 0.2124,
+      "Gas": 0.16,
+      "Hydro": 0.0394,
+      "Nuclear": 0.0068,
       "Other Fossil": 0.0718,
       "Other Renewables": 0.0002,
-      "Solar": 0.1664,
-      "Wind": 0.242
+      "Solar": 0.1834,
+      "Wind": 0.2429
     }
   },
   "DJ": {
@@ -3859,15 +3859,15 @@
       "Wind": 0.5431
     },
     "2025": {
-      "Bioenergy": 0.1149,
-      "Coal": 0.0993,
-      "Gas": 0.0929,
-      "Hydro": 0.0311,
-      "Nuclear": 0.0353,
-      "Other Fossil": 0.0388,
-      "Other Renewables": 0.0012,
-      "Solar": 0.1185,
-      "Wind": 0.468
+      "Bioenergy": 0.1042,
+      "Coal": 0.0928,
+      "Gas": 0.0908,
+      "Hydro": 0.0331,
+      "Nuclear": 0.0366,
+      "Other Fossil": 0.0384,
+      "Other Renewables": 0.0013,
+      "Solar": 0.1362,
+      "Wind": 0.4666
     }
   },
   "DM": {
@@ -4018,14 +4018,14 @@
     },
     "2025": {
       "Bioenergy": 0.0112,
-      "Coal": 0.2809,
-      "Gas": 0.4113,
-      "Hydro": 0.073,
+      "Coal": 0.278,
+      "Gas": 0.4123,
+      "Hydro": 0.0709,
       "Nuclear": 0,
-      "Other Fossil": 0.1011,
+      "Other Fossil": 0.1007,
       "Other Renewables": 0,
-      "Solar": 0.0742,
-      "Wind": 0.0483
+      "Solar": 0.0784,
+      "Wind": 0.0485
     }
   },
   "DZ": {
@@ -4176,14 +4176,14 @@
     },
     "2025": {
       "Bioenergy": 0.0002,
-      "Coal": 0.001,
-      "Gas": 0.0348,
-      "Hydro": 0.7139,
+      "Coal": 0.0009,
+      "Gas": 0.0343,
+      "Hydro": 0.7175,
       "Nuclear": 0.0006,
-      "Other Fossil": 0.2409,
+      "Other Fossil": 0.2381,
       "Other Renewables": 0.0002,
-      "Solar": 0.0026,
-      "Wind": 0.0059
+      "Solar": 0.0024,
+      "Wind": 0.0058
     }
   },
   "EE": {
@@ -4254,15 +4254,15 @@
       "Wind": 0.2017
     },
     "2025": {
-      "Bioenergy": 0.0739,
-      "Coal": 0.0422,
-      "Gas": 0.0747,
-      "Hydro": 0.0503,
-      "Nuclear": 0.0603,
-      "Other Fossil": 0.3355,
+      "Bioenergy": 0.0715,
+      "Coal": 0.0402,
+      "Gas": 0.0715,
+      "Hydro": 0.0504,
+      "Nuclear": 0.0588,
+      "Other Fossil": 0.321,
       "Other Renewables": 0.002,
-      "Solar": 0.1488,
-      "Wind": 0.2123
+      "Solar": 0.177,
+      "Wind": 0.2076
     }
   },
   "EG": {
@@ -4491,15 +4491,15 @@
       "Wind": 0.2368
     },
     "2025": {
-      "Bioenergy": 0.0141,
-      "Coal": 0.0103,
-      "Gas": 0.1652,
-      "Hydro": 0.1673,
-      "Nuclear": 0.1986,
-      "Other Fossil": 0.0066,
+      "Bioenergy": 0.0143,
+      "Coal": 0.0098,
+      "Gas": 0.1676,
+      "Hydro": 0.1672,
+      "Nuclear": 0.1913,
+      "Other Fossil": 0.0065,
       "Other Renewables": 0.0024,
-      "Solar": 0.1969,
-      "Wind": 0.2387
+      "Solar": 0.2144,
+      "Wind": 0.2264
     }
   },
   "ET": {
@@ -4649,15 +4649,15 @@
       "Wind": 0.2352
     },
     "2025": {
-      "Bioenergy": 0.1249,
-      "Coal": 0.0207,
-      "Gas": 0.0309,
-      "Hydro": 0.1692,
-      "Nuclear": 0.3205,
-      "Other Fossil": 0.0488,
-      "Other Renewables": 0.0034,
-      "Solar": 0.0209,
-      "Wind": 0.2606
+      "Bioenergy": 0.1214,
+      "Coal": 0.0186,
+      "Gas": 0.0282,
+      "Hydro": 0.1778,
+      "Nuclear": 0.3248,
+      "Other Fossil": 0.0467,
+      "Other Renewables": 0.0032,
+      "Solar": 0.0243,
+      "Wind": 0.2549
     }
   },
   "FJ": {
@@ -4965,14 +4965,14 @@
       "Wind": 0.0899
     },
     "2025": {
-      "Bioenergy": 0.0056,
-      "Coal": 0.003,
-      "Gas": 0.0389,
-      "Hydro": 0.1106,
-      "Nuclear": 0.6933,
-      "Other Fossil": 0.0073,
+      "Bioenergy": 0.0058,
+      "Coal": 0.0026,
+      "Gas": 0.0346,
+      "Hydro": 0.1118,
+      "Nuclear": 0.6913,
+      "Other Fossil": 0.0074,
       "Other Renewables": 0,
-      "Solar": 0.0499,
+      "Solar": 0.0551,
       "Wind": 0.0914
     }
   },
@@ -5123,15 +5123,15 @@
       "Wind": 0.3204
     },
     "2025": {
-      "Bioenergy": 0.0736,
-      "Coal": 0.0156,
-      "Gas": 0.3548,
-      "Hydro": 0.0311,
-      "Nuclear": 0.1575,
-      "Other Fossil": 0.0186,
+      "Bioenergy": 0.0747,
+      "Coal": 0.0152,
+      "Gas": 0.3387,
+      "Hydro": 0.0307,
+      "Nuclear": 0.1623,
+      "Other Fossil": 0.0189,
       "Other Renewables": 0.0008,
-      "Solar": 0.076,
-      "Wind": 0.2719
+      "Solar": 0.086,
+      "Wind": 0.2727
     }
   },
   "GD": {
@@ -5281,15 +5281,15 @@
       "Wind": 0.0136
     },
     "2025": {
-      "Bioenergy": 0.0034,
-      "Coal": 0.0862,
-      "Gas": 0.1727,
-      "Hydro": 0.6913,
-      "Nuclear": 0.0089,
-      "Other Fossil": 0.001,
-      "Other Renewables": 0.0009,
-      "Solar": 0.0135,
-      "Wind": 0.0221
+      "Bioenergy": 0.0029,
+      "Coal": 0.0723,
+      "Gas": 0.1449,
+      "Hydro": 0.7396,
+      "Nuclear": 0.0075,
+      "Other Fossil": 0.0008,
+      "Other Renewables": 0.0007,
+      "Solar": 0.0114,
+      "Wind": 0.0199
     }
   },
   "GF": {
@@ -5992,15 +5992,15 @@
       "Wind": 0.2196
     },
     "2025": {
-      "Bioenergy": 0.0009,
-      "Coal": 0.0704,
-      "Gas": 0.4263,
-      "Hydro": 0.0446,
-      "Nuclear": 0.0056,
-      "Other Fossil": 0.0007,
+      "Bioenergy": 0.0007,
+      "Coal": 0.0633,
+      "Gas": 0.4177,
+      "Hydro": 0.0452,
+      "Nuclear": 0.0048,
+      "Other Fossil": 0.0006,
       "Other Renewables": 0.0002,
-      "Solar": 0.2419,
-      "Wind": 0.2094
+      "Solar": 0.2579,
+      "Wind": 0.2096
     }
   },
   "GT": {
@@ -6388,14 +6388,14 @@
     },
     "2025": {
       "Bioenergy": 0.0081,
-      "Coal": 0.5608,
-      "Gas": 0.3395,
-      "Hydro": 0.0231,
+      "Coal": 0.5599,
+      "Gas": 0.3394,
+      "Hydro": 0.0234,
       "Nuclear": 0.0145,
-      "Other Fossil": 0.0052,
+      "Other Fossil": 0.0051,
       "Other Renewables": 0.0014,
-      "Solar": 0.0245,
-      "Wind": 0.023
+      "Solar": 0.025,
+      "Wind": 0.0231
     }
   },
   "HN": {
@@ -6474,7 +6474,7 @@
       "Other Fossil": 0.4371,
       "Other Renewables": 0.0264,
       "Solar": 0.1001,
-      "Wind": 0.0738
+      "Wind": 0.0739
     }
   },
   "HR": {
@@ -6545,15 +6545,15 @@
       "Wind": 0.1734
     },
     "2025": {
-      "Bioenergy": 0.0402,
-      "Coal": 0.0333,
-      "Gas": 0.2003,
-      "Hydro": 0.3559,
-      "Nuclear": 0.0488,
-      "Other Fossil": 0.011,
-      "Other Renewables": 0.0162,
-      "Solar": 0.0811,
-      "Wind": 0.2132
+      "Bioenergy": 0.0413,
+      "Coal": 0.0347,
+      "Gas": 0.1833,
+      "Hydro": 0.3542,
+      "Nuclear": 0.0527,
+      "Other Fossil": 0.0107,
+      "Other Renewables": 0.0174,
+      "Solar": 0.0944,
+      "Wind": 0.2114
     }
   },
   "HT": {
@@ -6703,15 +6703,15 @@
       "Wind": 0.0448
     },
     "2025": {
-      "Bioenergy": 0.0384,
-      "Coal": 0.0643,
-      "Gas": 0.2046,
-      "Hydro": 0.0387,
-      "Nuclear": 0.3754,
-      "Other Fossil": 0.0173,
+      "Bioenergy": 0.0376,
+      "Coal": 0.0614,
+      "Gas": 0.1874,
+      "Hydro": 0.0372,
+      "Nuclear": 0.3802,
+      "Other Fossil": 0.0172,
       "Other Renewables": 0.0038,
-      "Solar": 0.2191,
-      "Wind": 0.0384
+      "Solar": 0.2389,
+      "Wind": 0.0364
     }
   },
   "ID": {
@@ -6789,7 +6789,7 @@
       "Nuclear": 0.0003,
       "Other Fossil": 0.0356,
       "Other Renewables": 0.0476,
-      "Solar": 0.0009,
+      "Solar": 0.001,
       "Wind": 0.0021
     }
   },
@@ -6861,15 +6861,15 @@
       "Wind": 0.3483
     },
     "2025": {
-      "Bioenergy": 0.0083,
-      "Coal": 0.0538,
-      "Gas": 0.4177,
-      "Hydro": 0.0474,
-      "Nuclear": 0.0342,
-      "Other Fossil": 0.0405,
+      "Bioenergy": 0.0084,
+      "Coal": 0.0556,
+      "Gas": 0.4207,
+      "Hydro": 0.0472,
+      "Nuclear": 0.0344,
+      "Other Fossil": 0.0409,
       "Other Renewables": 0.0012,
-      "Solar": 0.0405,
-      "Wind": 0.3564
+      "Solar": 0.0446,
+      "Wind": 0.3469
     }
   },
   "IL": {
@@ -7019,15 +7019,15 @@
       "Wind": 0.0452
     },
     "2025": {
-      "Bioenergy": 0.0094,
-      "Coal": 0.7482,
-      "Gas": 0.0148,
-      "Hydro": 0.0602,
+      "Bioenergy": 0.0086,
+      "Coal": 0.7458,
+      "Gas": 0.0158,
+      "Hydro": 0.061,
       "Nuclear": 0.0317,
-      "Other Fossil": 0.0017,
+      "Other Fossil": 0.0018,
       "Other Renewables": 0.0016,
-      "Solar": 0.096,
-      "Wind": 0.0365
+      "Solar": 0.0967,
+      "Wind": 0.0371
     }
   },
   "IQ": {
@@ -7179,10 +7179,10 @@
     "2025": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.7754,
+      "Gas": 0.789,
       "Hydro": 0.0349,
       "Nuclear": 0,
-      "Other Fossil": 0.1896,
+      "Other Fossil": 0.176,
       "Other Renewables": 0,
       "Solar": 0,
       "Wind": 0
@@ -7336,14 +7336,14 @@
     },
     "2025": {
       "Bioenergy": 0.0546,
-      "Coal": 0.0382,
-      "Gas": 0.4998,
-      "Hydro": 0.1144,
-      "Nuclear": 0.0346,
+      "Coal": 0.0374,
+      "Gas": 0.4987,
+      "Hydro": 0.1151,
+      "Nuclear": 0.0344,
       "Other Fossil": 0.0301,
       "Other Renewables": 0.0191,
-      "Solar": 0.0818,
-      "Wind": 0.1275
+      "Solar": 0.0833,
+      "Wind": 0.1274
     }
   },
   "JM": {
@@ -7572,15 +7572,15 @@
       "Wind": 0.0198
     },
     "2025": {
-      "Bioenergy": 0.066,
-      "Coal": 0.2811,
-      "Gas": 0.2977,
-      "Hydro": 0.0674,
-      "Nuclear": 0.102,
-      "Other Fossil": 0.0304,
-      "Other Renewables": 0.0107,
-      "Solar": 0.114,
-      "Wind": 0.0305
+      "Bioenergy": 0.0672,
+      "Coal": 0.2739,
+      "Gas": 0.2939,
+      "Hydro": 0.0723,
+      "Nuclear": 0.103,
+      "Other Fossil": 0.0285,
+      "Other Renewables": 0.0109,
+      "Solar": 0.1194,
+      "Wind": 0.0309
     }
   },
   "KE": {
@@ -7651,15 +7651,15 @@
       "Wind": 0.1313
     },
     "2025": {
-      "Bioenergy": 0.0302,
-      "Coal": 0.0295,
-      "Gas": 0.0404,
-      "Hydro": 0.236,
+      "Bioenergy": 0.0306,
+      "Coal": 0.029,
+      "Gas": 0.0398,
+      "Hydro": 0.2357,
       "Nuclear": 0.0015,
-      "Other Fossil": 0.0956,
-      "Other Renewables": 0.388,
-      "Solar": 0.0343,
-      "Wind": 0.1446
+      "Other Fossil": 0.0969,
+      "Other Renewables": 0.3885,
+      "Solar": 0.0342,
+      "Wind": 0.1438
     }
   },
   "KG": {
@@ -7730,15 +7730,15 @@
       "Wind": 0.0067
     },
     "2025": {
-      "Bioenergy": 0.0016,
-      "Coal": 0.0975,
-      "Gas": 0.0155,
-      "Hydro": 0.8333,
+      "Bioenergy": 0.0015,
+      "Coal": 0.0972,
+      "Gas": 0.0154,
+      "Hydro": 0.8334,
       "Nuclear": 0.0043,
       "Other Fossil": 0.0335,
       "Other Renewables": 0.0004,
-      "Solar": 0.0071,
-      "Wind": 0.0068
+      "Solar": 0.0073,
+      "Wind": 0.0069
     }
   },
   "KH": {
@@ -7810,14 +7810,14 @@
     },
     "2025": {
       "Bioenergy": 0.0136,
-      "Coal": 0.4596,
-      "Gas": 0.0246,
-      "Hydro": 0.3737,
-      "Nuclear": 0.0146,
+      "Coal": 0.4587,
+      "Gas": 0.0245,
+      "Hydro": 0.374,
+      "Nuclear": 0.0147,
       "Other Fossil": 0.0552,
       "Other Renewables": 0.0014,
-      "Solar": 0.0342,
-      "Wind": 0.0232
+      "Solar": 0.0348,
+      "Wind": 0.0233
     }
   },
   "KI": {
@@ -8205,14 +8205,14 @@
     },
     "2025": {
       "Bioenergy": 0.0204,
-      "Coal": 0.2124,
-      "Gas": 0.3064,
-      "Hydro": 0.0047,
-      "Nuclear": 0.3549,
+      "Coal": 0.2081,
+      "Gas": 0.3058,
+      "Hydro": 0.0049,
+      "Nuclear": 0.3561,
       "Other Fossil": 0.0077,
-      "Other Renewables": 0.016,
-      "Solar": 0.0695,
-      "Wind": 0.0079
+      "Other Renewables": 0.0162,
+      "Solar": 0.073,
+      "Wind": 0.0078
     }
   },
   "KW": {
@@ -8285,10 +8285,10 @@
     "2025": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.5837,
+      "Gas": 0.5838,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": 0.4163,
+      "Other Fossil": 0.4162,
       "Other Renewables": 0,
       "Solar": 0,
       "Wind": 0
@@ -8442,14 +8442,14 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Coal": 0.5545,
-      "Gas": 0.2801,
-      "Hydro": 0.0858,
+      "Coal": 0.5502,
+      "Gas": 0.2779,
+      "Hydro": 0.0911,
       "Nuclear": 0,
-      "Other Fossil": 0.0208,
+      "Other Fossil": 0.0206,
       "Other Renewables": 0,
-      "Solar": 0.0153,
-      "Wind": 0.0435
+      "Solar": 0.0163,
+      "Wind": 0.0439
     }
   },
   "LA": {
@@ -8994,15 +8994,15 @@
       "Wind": 0.3149
     },
     "2025": {
-      "Bioenergy": 0.0206,
-      "Coal": 0.0367,
-      "Gas": 0.246,
-      "Hydro": 0.0642,
-      "Nuclear": 0.0507,
-      "Other Fossil": 0.109,
-      "Other Renewables": 0.0017,
-      "Solar": 0.1358,
-      "Wind": 0.3352
+      "Bioenergy": 0.0198,
+      "Coal": 0.0335,
+      "Gas": 0.2435,
+      "Hydro": 0.0619,
+      "Nuclear": 0.0472,
+      "Other Fossil": 0.1089,
+      "Other Renewables": 0.0016,
+      "Solar": 0.1584,
+      "Wind": 0.3252
     }
   },
   "LU": {
@@ -9073,15 +9073,15 @@
       "Wind": 0.1858
     },
     "2025": {
-      "Bioenergy": 0.0732,
-      "Coal": 0.0981,
-      "Gas": 0.1927,
-      "Hydro": 0.1341,
-      "Nuclear": 0.1418,
+      "Bioenergy": 0.0729,
+      "Coal": 0.0939,
+      "Gas": 0.1833,
+      "Hydro": 0.1332,
+      "Nuclear": 0.1394,
       "Other Fossil": 0.0407,
       "Other Renewables": 0.0048,
-      "Solar": 0.1365,
-      "Wind": 0.1781
+      "Solar": 0.1532,
+      "Wind": 0.1785
     }
   },
   "LV": {
@@ -9153,14 +9153,14 @@
     },
     "2025": {
       "Bioenergy": 0.0621,
-      "Coal": 0.0162,
-      "Gas": 0.2963,
-      "Hydro": 0.4565,
-      "Nuclear": 0.0259,
-      "Other Fossil": 0.0032,
-      "Other Renewables": 0.0009,
-      "Solar": 0.0904,
-      "Wind": 0.0485
+      "Coal": 0.0185,
+      "Gas": 0.2643,
+      "Hydro": 0.4636,
+      "Nuclear": 0.0304,
+      "Other Fossil": 0.0037,
+      "Other Renewables": 0.0011,
+      "Solar": 0.1047,
+      "Wind": 0.0518
     }
   },
   "LY": {
@@ -9390,13 +9390,13 @@
     },
     "2025": {
       "Bioenergy": 0.0006,
-      "Coal": 0.0028,
-      "Gas": 0.9217,
-      "Hydro": 0.0452,
+      "Coal": 0.0027,
+      "Gas": 0.9215,
+      "Hydro": 0.0453,
       "Nuclear": 0.0041,
       "Other Fossil": 0.0005,
       "Other Renewables": 0.0001,
-      "Solar": 0.0226,
+      "Solar": 0.0227,
       "Wind": 0.0025
     }
   },
@@ -9468,15 +9468,15 @@
       "Wind": 0.0916
     },
     "2025": {
-      "Bioenergy": 0.0105,
-      "Coal": 0.2692,
-      "Gas": 0.0773,
-      "Hydro": 0.4015,
-      "Nuclear": 0.0681,
-      "Other Fossil": 0.0082,
-      "Other Renewables": 0.0024,
-      "Solar": 0.0377,
-      "Wind": 0.1251
+      "Bioenergy": 0.012,
+      "Coal": 0.2429,
+      "Gas": 0.0862,
+      "Hydro": 0.3898,
+      "Nuclear": 0.0773,
+      "Other Fossil": 0.0093,
+      "Other Renewables": 0.0028,
+      "Solar": 0.0457,
+      "Wind": 0.1341
     }
   },
   "MG": {
@@ -9626,15 +9626,15 @@
       "Wind": 0.0428
     },
     "2025": {
-      "Bioenergy": 0.0093,
-      "Coal": 0.3955,
-      "Gas": 0.2679,
-      "Hydro": 0.1771,
-      "Nuclear": 0.0465,
+      "Bioenergy": 0.0089,
+      "Coal": 0.3982,
+      "Gas": 0.2661,
+      "Hydro": 0.1757,
+      "Nuclear": 0.0459,
       "Other Fossil": 0.0055,
       "Other Renewables": 0.0016,
-      "Solar": 0.0432,
-      "Wind": 0.0534
+      "Solar": 0.0452,
+      "Wind": 0.0531
     }
   },
   "ML": {
@@ -9864,14 +9864,14 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Coal": 0.9106,
+      "Coal": 0.9089,
       "Gas": 0,
       "Hydro": 0,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
       "Solar": 0,
-      "Wind": 0.0894
+      "Wind": 0.0911
     }
   },
   "MO": {
@@ -9942,15 +9942,15 @@
       "Wind": 0.063
     },
     "2025": {
-      "Bioenergy": 0.0558,
-      "Coal": 0.4561,
-      "Gas": 0.1604,
-      "Hydro": 0.0788,
-      "Nuclear": 0.0494,
-      "Other Fossil": 0.0343,
+      "Bioenergy": 0.0556,
+      "Coal": 0.4532,
+      "Gas": 0.1601,
+      "Hydro": 0.0797,
+      "Nuclear": 0.0496,
+      "Other Fossil": 0.0342,
       "Other Renewables": 0.0048,
-      "Solar": 0.0821,
-      "Wind": 0.0783
+      "Solar": 0.084,
+      "Wind": 0.0789
     }
   },
   "MQ": {
@@ -10258,15 +10258,15 @@
       "Wind": 0.0282
     },
     "2025": {
-      "Bioenergy": 0.0074,
-      "Coal": 0.0339,
-      "Gas": 0.6578,
-      "Hydro": 0.0429,
+      "Bioenergy": 0.0075,
+      "Coal": 0.033,
+      "Gas": 0.6501,
+      "Hydro": 0.0443,
       "Nuclear": 0.0501,
-      "Other Fossil": 0.0297,
+      "Other Fossil": 0.0307,
       "Other Renewables": 0.0017,
-      "Solar": 0.1456,
-      "Wind": 0.0308
+      "Solar": 0.1518,
+      "Wind": 0.0309
     }
   },
   "MU": {
@@ -10575,13 +10575,13 @@
     },
     "2025": {
       "Bioenergy": 0.0004,
-      "Coal": 0.0613,
-      "Gas": 0.6035,
-      "Hydro": 0.0618,
-      "Nuclear": 0.0316,
-      "Other Fossil": 0.097,
-      "Other Renewables": 0.0107,
-      "Solar": 0.0586,
+      "Coal": 0.063,
+      "Gas": 0.6041,
+      "Hydro": 0.0626,
+      "Nuclear": 0.0294,
+      "Other Fossil": 0.0951,
+      "Other Renewables": 0.0104,
+      "Solar": 0.0598,
       "Wind": 0.0752
     }
   },
@@ -10653,14 +10653,14 @@
       "Wind": 0
     },
     "2025": {
-      "Bioenergy": 0.0242,
-      "Coal": 0.4513,
-      "Gas": 0.3207,
-      "Hydro": 0.18,
+      "Bioenergy": 0.0239,
+      "Coal": 0.4529,
+      "Gas": 0.3215,
+      "Hydro": 0.1777,
       "Nuclear": 0,
-      "Other Fossil": 0.0051,
+      "Other Fossil": 0.0055,
       "Other Renewables": 0,
-      "Solar": 0.0187,
+      "Solar": 0.0186,
       "Wind": 0
     }
   },
@@ -11129,8 +11129,8 @@
     "2025": {
       "Bioenergy": 0.1683,
       "Coal": 0.0028,
-      "Gas": 0.0193,
-      "Hydro": 0.0873,
+      "Gas": 0.0194,
+      "Hydro": 0.0872,
       "Nuclear": 0.0017,
       "Other Fossil": 0.3978,
       "Other Renewables": 0.1562,
@@ -11206,15 +11206,15 @@
       "Wind": 0.2757
     },
     "2025": {
-      "Bioenergy": 0.0669,
-      "Coal": 0.1025,
-      "Gas": 0.3746,
+      "Bioenergy": 0.0658,
+      "Coal": 0.0849,
+      "Gas": 0.3595,
       "Hydro": 0.0009,
-      "Nuclear": 0.0241,
-      "Other Fossil": 0.011,
+      "Nuclear": 0.0239,
+      "Other Fossil": 0.01,
       "Other Renewables": 0.0044,
-      "Solar": 0.1962,
-      "Wind": 0.2194
+      "Solar": 0.2227,
+      "Wind": 0.2278
     }
   },
   "NO": {
@@ -11287,10 +11287,10 @@
     "2025": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.0066,
-      "Hydro": 0.9057,
+      "Gas": 0.006,
+      "Hydro": 0.9062,
       "Nuclear": 0,
-      "Other Fossil": 0.001,
+      "Other Fossil": 0.0011,
       "Other Renewables": 0.0026,
       "Solar": 0,
       "Wind": 0.0841
@@ -11364,15 +11364,15 @@
       "Wind": 0.0166
     },
     "2025": {
-      "Bioenergy": 0.0044,
-      "Coal": 0.1111,
+      "Bioenergy": 0.0043,
+      "Coal": 0.1104,
       "Gas": 0.0202,
-      "Hydro": 0.7991,
-      "Nuclear": 0.012,
+      "Hydro": 0.7994,
+      "Nuclear": 0.0121,
       "Other Fossil": 0.0012,
       "Other Renewables": 0.0012,
-      "Solar": 0.0303,
-      "Wind": 0.0204
+      "Solar": 0.0308,
+      "Wind": 0.0205
     }
   },
   "NR": {
@@ -11601,15 +11601,15 @@
       "Wind": 0.0917
     },
     "2025": {
-      "Bioenergy": 0.0006,
-      "Coal": 0.0535,
-      "Gas": 0.1265,
-      "Hydro": 0.5041,
+      "Bioenergy": 0.0005,
+      "Coal": 0.0537,
+      "Gas": 0.1249,
+      "Hydro": 0.5039,
       "Nuclear": 0,
       "Other Fossil": 0,
-      "Other Renewables": 0.2328,
+      "Other Renewables": 0.2323,
       "Solar": 0,
-      "Wind": 0.0824
+      "Wind": 0.0847
     }
   },
   "OM": {
@@ -11838,15 +11838,15 @@
       "Wind": 0.0651
     },
     "2025": {
-      "Bioenergy": 0.0051,
+      "Bioenergy": 0.0049,
       "Coal": 0,
-      "Gas": 0.2855,
-      "Hydro": 0.6228,
+      "Gas": 0.2869,
+      "Hydro": 0.6199,
       "Nuclear": 0,
       "Other Fossil": 0.002,
       "Other Renewables": 0,
-      "Solar": 0.0239,
-      "Wind": 0.0607
+      "Solar": 0.0248,
+      "Wind": 0.0615
     }
   },
   "PF": {
@@ -12075,15 +12075,15 @@
       "Wind": 0.01
     },
     "2025": {
-      "Bioenergy": 0.0119,
-      "Coal": 0.5954,
+      "Bioenergy": 0.0118,
+      "Coal": 0.5991,
       "Gas": 0.1637,
-      "Hydro": 0.0949,
+      "Hydro": 0.0921,
       "Nuclear": 0,
-      "Other Fossil": 0.0052,
-      "Other Renewables": 0.0782,
-      "Solar": 0.0402,
-      "Wind": 0.0104
+      "Other Fossil": 0.0053,
+      "Other Renewables": 0.0776,
+      "Solar": 0.0408,
+      "Wind": 0.0095
     }
   },
   "PK": {
@@ -12154,15 +12154,15 @@
       "Wind": 0.0244
     },
     "2025": {
-      "Bioenergy": 0.0053,
-      "Coal": 0.1751,
-      "Gas": 0.2197,
-      "Hydro": 0.149,
-      "Nuclear": 0.1715,
-      "Other Fossil": 0.0046,
+      "Bioenergy": 0.0049,
+      "Coal": 0.1781,
+      "Gas": 0.2201,
+      "Hydro": 0.1532,
+      "Nuclear": 0.1654,
+      "Other Fossil": 0.0049,
       "Other Renewables": 0,
-      "Solar": 0.2478,
-      "Wind": 0.0269
+      "Solar": 0.245,
+      "Wind": 0.0285
     }
   },
   "PL": {
@@ -12233,15 +12233,15 @@
       "Wind": 0.1507
     },
     "2025": {
-      "Bioenergy": 0.0196,
-      "Coal": 0.5328,
-      "Gas": 0.1264,
-      "Hydro": 0.0108,
-      "Nuclear": 0.001,
-      "Other Fossil": 0.0535,
+      "Bioenergy": 0.02,
+      "Coal": 0.52,
+      "Gas": 0.1251,
+      "Hydro": 0.0116,
+      "Nuclear": 0.0018,
+      "Other Fossil": 0.0538,
       "Other Renewables": 0.0033,
-      "Solar": 0.1152,
-      "Wind": 0.1375
+      "Solar": 0.1288,
+      "Wind": 0.1357
     }
   },
   "PM": {
@@ -12392,14 +12392,14 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Coal": 0.2291,
-      "Gas": 0.393,
+      "Coal": 0.2361,
+      "Gas": 0.3889,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": 0.3512,
+      "Other Fossil": 0.3486,
       "Other Renewables": 0,
-      "Solar": 0.0151,
-      "Wind": 0.0117
+      "Solar": 0.0153,
+      "Wind": 0.0111
     }
   },
   "PS": {
@@ -12549,15 +12549,15 @@
       "Wind": 0.3021
     },
     "2025": {
-      "Bioenergy": 0.055,
-      "Coal": 0.0092,
-      "Gas": 0.1407,
-      "Hydro": 0.3681,
-      "Nuclear": 0.0131,
-      "Other Fossil": 0.0052,
+      "Bioenergy": 0.0555,
+      "Coal": 0.0089,
+      "Gas": 0.1465,
+      "Hydro": 0.3637,
+      "Nuclear": 0.013,
+      "Other Fossil": 0.0054,
       "Other Renewables": 0.0004,
-      "Solar": 0.1166,
-      "Wind": 0.2916
+      "Solar": 0.1313,
+      "Wind": 0.2752
     }
   },
   "PY": {
@@ -12865,15 +12865,15 @@
       "Wind": 0.1188
     },
     "2025": {
-      "Bioenergy": 0.011,
-      "Coal": 0.1344,
-      "Gas": 0.1882,
-      "Hydro": 0.2405,
-      "Nuclear": 0.205,
+      "Bioenergy": 0.0108,
+      "Coal": 0.1312,
+      "Gas": 0.1787,
+      "Hydro": 0.2514,
+      "Nuclear": 0.1976,
       "Other Fossil": 0.002,
       "Other Renewables": 0.0006,
-      "Solar": 0.0923,
-      "Wind": 0.1259
+      "Solar": 0.1021,
+      "Wind": 0.1257
     }
   },
   "RS": {
@@ -12944,14 +12944,14 @@
       "Wind": 0.0375
     },
     "2025": {
-      "Bioenergy": 0.0081,
-      "Coal": 0.5885,
-      "Gas": 0.0588,
-      "Hydro": 0.2852,
-      "Nuclear": 0.0053,
-      "Other Fossil": 0.0073,
-      "Other Renewables": 0.0002,
-      "Solar": 0.003,
+      "Bioenergy": 0.0085,
+      "Coal": 0.5796,
+      "Gas": 0.059,
+      "Hydro": 0.2893,
+      "Nuclear": 0.0074,
+      "Other Fossil": 0.0077,
+      "Other Renewables": 0.0003,
+      "Solar": 0.0047,
       "Wind": 0.0437
     }
   },
@@ -13024,13 +13024,13 @@
     },
     "2025": {
       "Bioenergy": 0.0008,
-      "Coal": 0.1946,
-      "Gas": 0.4694,
-      "Hydro": 0.1462,
-      "Nuclear": 0.1728,
-      "Other Fossil": 0.0113,
+      "Coal": 0.1933,
+      "Gas": 0.4659,
+      "Hydro": 0.1489,
+      "Nuclear": 0.1749,
+      "Other Fossil": 0.0112,
       "Other Renewables": 0,
-      "Solar": 0.0014,
+      "Solar": 0.0016,
       "Wind": 0.0035
     }
   },
@@ -13497,15 +13497,15 @@
       "Wind": 0.2507
     },
     "2025": {
-      "Bioenergy": 0.0414,
+      "Bioenergy": 0.0411,
       "Coal": 0,
       "Gas": 0,
-      "Hydro": 0.4035,
-      "Nuclear": 0.2876,
+      "Hydro": 0.3986,
+      "Nuclear": 0.2869,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0113,
-      "Wind": 0.2562
+      "Solar": 0.0137,
+      "Wind": 0.2596
     }
   },
   "SG": {
@@ -13578,12 +13578,12 @@
     "2025": {
       "Bioenergy": 0.0001,
       "Coal": 0.0022,
-      "Gas": 0.9513,
+      "Gas": 0.9515,
       "Hydro": 0.0004,
       "Nuclear": 0.0002,
-      "Other Fossil": 0.0214,
+      "Other Fossil": 0.0212,
       "Other Renewables": 0,
-      "Solar": 0.0239,
+      "Solar": 0.024,
       "Wind": 0.0004
     }
   },
@@ -13735,14 +13735,14 @@
     },
     "2025": {
       "Bioenergy": 0.0078,
-      "Coal": 0.1655,
-      "Gas": 0.0523,
-      "Hydro": 0.2714,
-      "Nuclear": 0.3869,
+      "Coal": 0.1401,
+      "Gas": 0.0527,
+      "Hydro": 0.2849,
+      "Nuclear": 0.3899,
       "Other Fossil": 0.0001,
       "Other Renewables": 0,
-      "Solar": 0.1155,
-      "Wind": 0.0006
+      "Solar": 0.1242,
+      "Wind": 0.0005
     }
   },
   "SK": {
@@ -13813,14 +13813,14 @@
       "Wind": 0
     },
     "2025": {
-      "Bioenergy": 0.0325,
-      "Coal": 0.0025,
-      "Gas": 0.1003,
-      "Hydro": 0.0987,
-      "Nuclear": 0.6799,
-      "Other Fossil": 0.0494,
-      "Other Renewables": 0.017,
-      "Solar": 0.0197,
+      "Bioenergy": 0.0339,
+      "Coal": 0.0021,
+      "Gas": 0.0956,
+      "Hydro": 0.0993,
+      "Nuclear": 0.6826,
+      "Other Fossil": 0.0475,
+      "Other Renewables": 0.0173,
+      "Solar": 0.0217,
       "Wind": 0
     }
   },
@@ -14840,15 +14840,15 @@
       "Wind": 0.0268
     },
     "2025": {
-      "Bioenergy": 0.063,
-      "Coal": 0.2185,
-      "Gas": 0.5872,
-      "Hydro": 0.0502,
-      "Nuclear": 0.007,
+      "Bioenergy": 0.0632,
+      "Coal": 0.2197,
+      "Gas": 0.5876,
+      "Hydro": 0.0497,
+      "Nuclear": 0.0071,
       "Other Fossil": 0.0008,
       "Other Renewables": 0.0007,
-      "Solar": 0.0475,
-      "Wind": 0.0252
+      "Solar": 0.0465,
+      "Wind": 0.0247
     }
   },
   "TJ": {
@@ -14920,10 +14920,10 @@
     },
     "2025": {
       "Bioenergy": 0.0003,
-      "Coal": 0.1129,
+      "Coal": 0.1128,
       "Gas": 0.0244,
       "Hydro": 0.8581,
-      "Nuclear": 0.0009,
+      "Nuclear": 0.001,
       "Other Fossil": 0.0001,
       "Other Renewables": 0.0001,
       "Solar": 0.0016,
@@ -15314,15 +15314,15 @@
       "Wind": 0.107
     },
     "2025": {
-      "Bioenergy": 0.0251,
-      "Coal": 0.3225,
-      "Gas": 0.2088,
-      "Hydro": 0.206,
+      "Bioenergy": 0.0253,
+      "Coal": 0.3163,
+      "Gas": 0.1988,
+      "Hydro": 0.2159,
       "Nuclear": 0.0003,
-      "Other Fossil": 0.0033,
-      "Other Renewables": 0.0332,
-      "Solar": 0.0945,
-      "Wind": 0.1061
+      "Other Fossil": 0.0034,
+      "Other Renewables": 0.0329,
+      "Solar": 0.102,
+      "Wind": 0.1051
     }
   },
   "TT": {
@@ -15473,14 +15473,14 @@
     },
     "2025": {
       "Bioenergy": 0.0009,
-      "Coal": 0.3538,
-      "Gas": 0.4606,
-      "Hydro": 0.0169,
-      "Nuclear": 0.0333,
+      "Coal": 0.3575,
+      "Gas": 0.4593,
+      "Hydro": 0.0175,
+      "Nuclear": 0.0331,
       "Other Fossil": 0.0291,
       "Other Renewables": 0,
-      "Solar": 0.05,
-      "Wind": 0.0553
+      "Solar": 0.051,
+      "Wind": 0.0515
     }
   },
   "TZ": {
@@ -15789,14 +15789,14 @@
     },
     "2025": {
       "Bioenergy": 0.0106,
-      "Coal": 0.1623,
-      "Gas": 0.3706,
-      "Hydro": 0.0611,
-      "Nuclear": 0.1773,
-      "Other Fossil": 0.0076,
+      "Coal": 0.1581,
+      "Gas": 0.3723,
+      "Hydro": 0.0625,
+      "Nuclear": 0.1766,
+      "Other Fossil": 0.0072,
       "Other Renewables": 0.0042,
-      "Solar": 0.0837,
-      "Wind": 0.1226
+      "Solar": 0.0883,
+      "Wind": 0.1201
     }
   },
   "UY": {
@@ -15867,15 +15867,15 @@
       "Wind": 0.3322
     },
     "2025": {
-      "Bioenergy": 0.146,
-      "Coal": 0.0026,
-      "Gas": 0.0361,
-      "Hydro": 0.4133,
-      "Nuclear": 0.0017,
-      "Other Fossil": 0.0142,
-      "Other Renewables": 0.0005,
-      "Solar": 0.0463,
-      "Wind": 0.3393
+      "Bioenergy": 0.1431,
+      "Coal": 0.0022,
+      "Gas": 0.0305,
+      "Hydro": 0.4243,
+      "Nuclear": 0.0015,
+      "Other Fossil": 0.012,
+      "Other Renewables": 0.0004,
+      "Solar": 0.0437,
+      "Wind": 0.3423
     }
   },
   "UZ": {
@@ -15947,14 +15947,14 @@
     },
     "2025": {
       "Bioenergy": 0.0004,
-      "Coal": 0.0697,
+      "Coal": 0.0696,
       "Gas": 0.8122,
       "Hydro": 0.1014,
       "Nuclear": 0.0012,
       "Other Fossil": 0.0111,
       "Other Renewables": 0.0001,
-      "Solar": 0.0021,
-      "Wind": 0.0018
+      "Solar": 0.0022,
+      "Wind": 0.0019
     }
   },
   "VC": {
@@ -16342,14 +16342,14 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Coal": 0.5819,
-      "Gas": 0.0699,
-      "Hydro": 0.2066,
+      "Coal": 0.5796,
+      "Gas": 0.069,
+      "Hydro": 0.2162,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0946,
-      "Wind": 0.047
+      "Solar": 0.0935,
+      "Wind": 0.0416
     }
   },
   "VU": {
@@ -16578,15 +16578,15 @@
       "Wind": 0.0647
     },
     "2025": {
-      "Bioenergy": 0.0076,
-      "Coal": 0.6807,
-      "Gas": 0.0641,
-      "Hydro": 0.0902,
-      "Nuclear": 0.0519,
-      "Other Fossil": 0.006,
-      "Other Renewables": 0.0017,
-      "Solar": 0.0192,
-      "Wind": 0.0785
+      "Bioenergy": 0.0077,
+      "Coal": 0.6697,
+      "Gas": 0.0631,
+      "Hydro": 0.0977,
+      "Nuclear": 0.0522,
+      "Other Fossil": 0.0061,
+      "Other Renewables": 0.0018,
+      "Solar": 0.0219,
+      "Wind": 0.0797
     }
   },
   "YE": {
@@ -16737,14 +16737,14 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Coal": 0.7892,
+      "Coal": 0.7926,
       "Gas": 0,
-      "Hydro": 0.0104,
-      "Nuclear": 0.0427,
-      "Other Fossil": 0.0276,
-      "Other Renewables": 0.0006,
-      "Solar": 0.0876,
-      "Wind": 0.0419
+      "Hydro": 0.012,
+      "Nuclear": 0.0416,
+      "Other Fossil": 0.0271,
+      "Other Renewables": 0.0005,
+      "Solar": 0.085,
+      "Wind": 0.0412
     }
   },
   "ZM": {