@digital4better/data 1.3.0 → 1.3.2

package/data/mix/country-yearly.json

@@ -131,30 +131,30 @@
       "Nuclear": 0.0411,
       "Other Fossil": 0.0213,
       "Other Renewables": 0.004,
-      "Solar": 0.0569,
+      "Solar": 0.057,
       "Wind": 0.0541
     },
     "2024": {
       "Bioenergy": 0.0161,
-      "Coal": 0.4337,
+      "Coal": 0.4338,
       "Gas": 0.0756,
-      "Hydro": 0.2844,
-      "Nuclear": 0.0403,
+      "Hydro": 0.2843,
+      "Nuclear": 0.0404,
       "Other Fossil": 0.0201,
       "Other Renewables": 0.0041,
       "Solar": 0.0689,
       "Wind": 0.0567
     },
     "2025": {
-      "Bioenergy": 0.0161,
-      "Coal": 0.4236,
-      "Gas": 0.075,
-      "Hydro": 0.2623,
+      "Bioenergy": 0.0162,
+      "Coal": 0.4234,
+      "Gas": 0.0749,
+      "Hydro": 0.2625,
       "Nuclear": 0.0445,
-      "Other Fossil": 0.0202,
-      "Other Renewables": 0.0044,
+      "Other Fossil": 0.0203,
+      "Other Renewables": 0.0043,
       "Solar": 0.0834,
-      "Wind": 0.0705
+      "Wind": 0.0706
     }
   },
   "AG": {
@@ -293,25 +293,25 @@
       "Wind": 0.0398
     },
     "2024": {
-      "Bioenergy": 0.009,
+      "Bioenergy": 0.0089,
       "Coal": 0.0422,
-      "Gas": 0.0716,
+      "Gas": 0.0717,
       "Hydro": 0.738,
-      "Nuclear": 0.0641,
+      "Nuclear": 0.064,
       "Other Fossil": 0.0064,
       "Other Renewables": 0.002,
-      "Solar": 0.0264,
+      "Solar": 0.0263,
       "Wind": 0.0404
     },
     "2025": {
       "Bioenergy": 0.0092,
       "Coal": 0.0426,
-      "Gas": 0.0749,
-      "Hydro": 0.7341,
-      "Nuclear": 0.0626,
+      "Gas": 0.0754,
+      "Hydro": 0.734,
+      "Nuclear": 0.0623,
       "Other Fossil": 0.0075,
       "Other Renewables": 0.0021,
-      "Solar": 0.0287,
+      "Solar": 0.0286,
       "Wind": 0.0383
     }
   },
@@ -363,34 +363,34 @@
     "2023": {
       "Bioenergy": 0.0002,
       "Coal": 0.0053,
-      "Gas": 0.4361,
-      "Hydro": 0.1955,
-      "Nuclear": 0.3166,
+      "Gas": 0.4366,
+      "Hydro": 0.1945,
+      "Nuclear": 0.317,
       "Other Fossil": 0.0001,
       "Other Renewables": 0,
-      "Solar": 0.0454,
+      "Solar": 0.0455,
       "Wind": 0.0007
     },
     "2024": {
       "Bioenergy": 0.0003,
-      "Coal": 0.0091,
-      "Gas": 0.4239,
-      "Hydro": 0.2249,
-      "Nuclear": 0.2781,
+      "Coal": 0.0089,
+      "Gas": 0.4007,
+      "Hydro": 0.2073,
+      "Nuclear": 0.3265,
       "Other Fossil": 0.0001,
       "Other Renewables": 0.0001,
-      "Solar": 0.0623,
+      "Solar": 0.055,
       "Wind": 0.0012
     },
     "2025": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.4925,
-      "Hydro": 0.194,
-      "Nuclear": 0.2388,
+      "Gas": 0.3463,
+      "Hydro": 0.2098,
+      "Nuclear": 0.3829,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0746,
+      "Solar": 0.061,
       "Wind": 0
     }
   },
@@ -531,7 +531,7 @@
     },
     "2024": {
       "Bioenergy": 0.0088,
-      "Coal": 0.01,
+      "Coal": 0.0099,
       "Gas": 0.5042,
       "Hydro": 0.2506,
       "Nuclear": 0.072,
@@ -546,7 +546,7 @@
       "Gas": 0.5589,
       "Hydro": 0.1917,
       "Nuclear": 0.0731,
-      "Other Fossil": 0.0089,
+      "Other Fossil": 0.0088,
       "Other Renewables": 0.0001,
       "Solar": 0.0331,
       "Wind": 0.1201
@@ -699,15 +699,15 @@
       "Wind": 0.1338
     },
     "2025": {
-      "Bioenergy": 0.0323,
+      "Bioenergy": 0.0325,
       "Coal": 0.013,
-      "Gas": 0.1677,
-      "Hydro": 0.4905,
+      "Gas": 0.1687,
+      "Hydro": 0.4878,
       "Nuclear": 0.0178,
-      "Other Fossil": 0.0165,
+      "Other Fossil": 0.0166,
       "Other Renewables": 0.0006,
-      "Solar": 0.1304,
-      "Wind": 0.1312
+      "Solar": 0.131,
+      "Wind": 0.1319
     }
   },
   "AU": {
@@ -917,7 +917,7 @@
       "Bioenergy": 0.0001,
       "Coal": 0.0021,
       "Gas": 0.9229,
-      "Hydro": 0.0673,
+      "Hydro": 0.0672,
       "Nuclear": 0.0002,
       "Other Fossil": 0.0045,
       "Other Renewables": 0,
@@ -927,23 +927,23 @@
     "2024": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.8658,
-      "Hydro": 0.1156,
+      "Gas": 0.8687,
+      "Hydro": 0.1157,
       "Nuclear": 0,
-      "Other Fossil": 0.0044,
+      "Other Fossil": 0.0047,
       "Other Renewables": 0,
-      "Solar": 0.0142,
+      "Solar": 0.011,
       "Wind": 0
     },
     "2025": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.8685,
-      "Hydro": 0.1036,
+      "Gas": 0.8711,
+      "Hydro": 0.1015,
       "Nuclear": 0,
-      "Other Fossil": 0.004,
+      "Other Fossil": 0.0091,
       "Other Renewables": 0,
-      "Solar": 0.0239,
+      "Solar": 0.0183,
       "Wind": 0
     }
   },
@@ -1016,14 +1016,14 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Coal": 0.5989,
+      "Coal": 0.5953,
       "Gas": 0,
-      "Hydro": 0.3671,
+      "Hydro": 0.365,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0182,
-      "Wind": 0.0158
+      "Solar": 0.024,
+      "Wind": 0.0157
     }
   },
   "BB": {
@@ -1174,14 +1174,14 @@
     },
     "2025": {
       "Bioenergy": 0.0034,
-      "Coal": 0.353,
-      "Gas": 0.4469,
-      "Hydro": 0.0148,
-      "Nuclear": 0.0093,
-      "Other Fossil": 0.1268,
+      "Coal": 0.3575,
+      "Gas": 0.4317,
+      "Hydro": 0.015,
+      "Nuclear": 0.0094,
+      "Other Fossil": 0.1366,
       "Other Renewables": 0.0009,
-      "Solar": 0.03,
-      "Wind": 0.0148
+      "Solar": 0.0305,
+      "Wind": 0.0149
     }
   },
   "BE": {
@@ -1241,11 +1241,11 @@
       "Wind": 0.1828
     },
     "2024": {
-      "Bioenergy": 0.0119,
+      "Bioenergy": 0.0118,
       "Coal": 0.018,
-      "Gas": 0.166,
+      "Gas": 0.1661,
       "Hydro": 0.026,
-      "Nuclear": 0.3957,
+      "Nuclear": 0.3956,
       "Other Fossil": 0.0919,
       "Other Renewables": 0.0009,
       "Solar": 0.1117,
@@ -1254,9 +1254,9 @@
     "2025": {
       "Bioenergy": 0.0123,
       "Coal": 0.02,
-      "Gas": 0.2126,
+      "Gas": 0.2128,
       "Hydro": 0.0275,
-      "Nuclear": 0.3477,
+      "Nuclear": 0.3476,
       "Other Fossil": 0.0999,
       "Other Renewables": 0.001,
       "Solar": 0.1341,
@@ -1401,9 +1401,9 @@
     "2024": {
       "Bioenergy": 0.0044,
       "Coal": 0.265,
-      "Gas": 0.0638,
+      "Gas": 0.0639,
       "Hydro": 0.082,
-      "Nuclear": 0.4137,
+      "Nuclear": 0.4136,
       "Other Fossil": 0.0007,
       "Other Renewables": 0.0002,
       "Solar": 0.1291,
@@ -1418,7 +1418,7 @@
       "Other Fossil": 0.0001,
       "Other Renewables": 0,
       "Solar": 0.1382,
-      "Wind": 0.0349
+      "Wind": 0.0348
     }
   },
   "BH": {
@@ -1954,24 +1954,24 @@
     "2024": {
       "Bioenergy": 0.0136,
       "Coal": 0.0131,
-      "Gas": 0.0651,
+      "Gas": 0.0649,
       "Hydro": 0.6148,
       "Nuclear": 0.0226,
-      "Other Fossil": 0.0111,
+      "Other Fossil": 0.0113,
       "Other Renewables": 0,
       "Solar": 0.1076,
       "Wind": 0.1521
     },
     "2025": {
-      "Bioenergy": 0.0066,
+      "Bioenergy": 0.0076,
       "Coal": 0.0088,
-      "Gas": 0.0376,
-      "Hydro": 0.6703,
+      "Gas": 0.0395,
+      "Hydro": 0.658,
       "Nuclear": 0.0205,
-      "Other Fossil": 0.0097,
+      "Other Fossil": 0.0098,
       "Other Renewables": 0,
-      "Solar": 0.126,
-      "Wind": 0.1205
+      "Solar": 0.1252,
+      "Wind": 0.1305
     }
   },
   "BS": {
@@ -2268,26 +2268,26 @@
       "Wind": 0.0045
     },
     "2024": {
-      "Bioenergy": 0.0132,
-      "Coal": 0.001,
-      "Gas": 0.5127,
-      "Hydro": 0.0102,
-      "Nuclear": 0.3797,
-      "Other Fossil": 0.0726,
+      "Bioenergy": 0.0099,
+      "Coal": 0.0012,
+      "Gas": 0.5339,
+      "Hydro": 0.0125,
+      "Nuclear": 0.3625,
+      "Other Fossil": 0.0686,
       "Other Renewables": 0.0001,
-      "Solar": 0.0061,
-      "Wind": 0.0044
+      "Solar": 0.0063,
+      "Wind": 0.0051
     },
     "2025": {
-      "Bioenergy": 0.0125,
-      "Coal": 0,
-      "Gas": 0.5719,
-      "Hydro": 0.0063,
-      "Nuclear": 0.325,
-      "Other Fossil": 0.075,
+      "Bioenergy": 0.0154,
+      "Coal": 0.0002,
+      "Gas": 0.5813,
+      "Hydro": 0.0105,
+      "Nuclear": 0.314,
+      "Other Fossil": 0.0706,
       "Other Renewables": 0,
-      "Solar": 0.0063,
-      "Wind": 0.0031
+      "Solar": 0.0026,
+      "Wind": 0.0053
     }
   },
   "BZ": {
@@ -2350,23 +2350,23 @@
       "Bioenergy": 0.171,
       "Coal": 0.0158,
       "Gas": 0.1042,
-      "Hydro": 0.5107,
+      "Hydro": 0.5108,
       "Nuclear": 0.0092,
       "Other Fossil": 0.1038,
       "Other Renewables": 0.0024,
       "Solar": 0.0419,
-      "Wind": 0.0409
+      "Wind": 0.041
     },
     "2025": {
       "Bioenergy": 0.1698,
-      "Coal": 0.014,
-      "Gas": 0.0952,
-      "Hydro": 0.5248,
+      "Coal": 0.0137,
+      "Gas": 0.0948,
+      "Hydro": 0.5261,
       "Nuclear": 0.0086,
-      "Other Fossil": 0.1012,
+      "Other Fossil": 0.1004,
       "Other Renewables": 0.0023,
-      "Solar": 0.0467,
-      "Wind": 0.0373
+      "Solar": 0.0468,
+      "Wind": 0.0376
     }
   },
   "CA": {
@@ -2744,7 +2744,7 @@
     "2024": {
       "Bioenergy": 0.0004,
       "Coal": 0.002,
-      "Gas": 0.0035,
+      "Gas": 0.0036,
       "Hydro": 0.5893,
       "Nuclear": 0.292,
       "Other Fossil": 0.0397,
@@ -2754,13 +2754,13 @@
     },
     "2025": {
       "Bioenergy": 0.0023,
-      "Coal": 0.0121,
+      "Coal": 0.012,
       "Gas": 0.021,
-      "Hydro": 0.4615,
-      "Nuclear": 0.3326,
-      "Other Fossil": 0.0498,
+      "Hydro": 0.4617,
+      "Nuclear": 0.3309,
+      "Other Fossil": 0.0512,
       "Other Renewables": 0.0005,
-      "Solar": 0.1075,
+      "Solar": 0.1077,
       "Wind": 0.0127
     }
   },
@@ -3129,7 +3129,7 @@
       "Bioenergy": 0.021,
       "Coal": 0.6187,
       "Gas": 0.0299,
-      "Hydro": 0.124,
+      "Hydro": 0.1241,
       "Nuclear": 0.0466,
       "Other Fossil": 0.0017,
       "Other Renewables": 0,
@@ -3140,102 +3140,102 @@
       "Bioenergy": 0.02,
       "Coal": 0.5913,
       "Gas": 0.0286,
-      "Hydro": 0.1294,
-      "Nuclear": 0.0449,
+      "Hydro": 0.1293,
+      "Nuclear": 0.0448,
       "Other Fossil": 0.0017,
       "Other Renewables": 0,
-      "Solar": 0.0841,
+      "Solar": 0.0842,
       "Wind": 0.1001
     },
     "2025": {
       "Bioenergy": 0.0192,
-      "Coal": 0.5678,
-      "Gas": 0.0275,
-      "Hydro": 0.097,
-      "Nuclear": 0.0503,
+      "Coal": 0.5661,
+      "Gas": 0.0274,
+      "Hydro": 0.1014,
+      "Nuclear": 0.0492,
       "Other Fossil": 0.0016,
       "Other Renewables": 0,
-      "Solar": 0.1071,
-      "Wind": 0.1295
+      "Solar": 0.108,
+      "Wind": 0.1271
     }
   },
   "CO": {
     "2019": {
-      "Bioenergy": 0.0013,
-      "Coal": 0.1063,
-      "Gas": 0.0856,
-      "Hydro": 0.7981,
-      "Nuclear": 0,
-      "Other Fossil": 0.0059,
-      "Other Renewables": 0,
-      "Solar": 0.0016,
-      "Wind": 0.0012
+      "Bioenergy": 0.0016,
+      "Coal": 0.1044,
+      "Gas": 0.0915,
+      "Hydro": 0.7866,
+      "Nuclear": 0.0008,
+      "Other Fossil": 0.0094,
+      "Other Renewables": 0.0003,
+      "Solar": 0.0022,
+      "Wind": 0.0032
     },
     "2020": {
-      "Bioenergy": 0.0022,
-      "Coal": 0.1328,
-      "Gas": 0.0774,
-      "Hydro": 0.7715,
-      "Nuclear": 0,
-      "Other Fossil": 0.013,
-      "Other Renewables": 0,
-      "Solar": 0.0031,
-      "Wind": 0
+      "Bioenergy": 0.0027,
+      "Coal": 0.1268,
+      "Gas": 0.0896,
+      "Hydro": 0.7523,
+      "Nuclear": 0.0017,
+      "Other Fossil": 0.0175,
+      "Other Renewables": 0.0006,
+      "Solar": 0.0046,
+      "Wind": 0.0042
     },
     "2021": {
-      "Bioenergy": 0,
-      "Coal": 0.06,
-      "Gas": 0.0733,
-      "Hydro": 0.8542,
-      "Nuclear": 0,
-      "Other Fossil": 0.0071,
-      "Other Renewables": 0,
-      "Solar": 0.0047,
-      "Wind": 0.0008
+      "Bioenergy": 0.0003,
+      "Coal": 0.0594,
+      "Gas": 0.0797,
+      "Hydro": 0.8419,
+      "Nuclear": 0.0007,
+      "Other Fossil": 0.009,
+      "Other Renewables": 0.0002,
+      "Solar": 0.0056,
+      "Wind": 0.0032
     },
     "2022": {
-      "Bioenergy": 0,
-      "Coal": 0.0466,
-      "Gas": 0.0766,
-      "Hydro": 0.8641,
-      "Nuclear": 0,
-      "Other Fossil": 0.0051,
-      "Other Renewables": 0,
-      "Solar": 0.0067,
-      "Wind": 0.0009
+      "Bioenergy": 0.0001,
+      "Coal": 0.0464,
+      "Gas": 0.0794,
+      "Hydro": 0.8576,
+      "Nuclear": 0.0004,
+      "Other Fossil": 0.0064,
+      "Other Renewables": 0.0001,
+      "Solar": 0.0073,
+      "Wind": 0.0023
     },
     "2023": {
-      "Bioenergy": 0,
-      "Coal": 0.0998,
-      "Gas": 0.0861,
-      "Hydro": 0.7876,
-      "Nuclear": 0,
-      "Other Fossil": 0.0078,
-      "Other Renewables": 0,
-      "Solar": 0.0159,
-      "Wind": 0.0029
+      "Bioenergy": 0.0005,
+      "Coal": 0.0968,
+      "Gas": 0.0939,
+      "Hydro": 0.7712,
+      "Nuclear": 0.0009,
+      "Other Fossil": 0.0106,
+      "Other Renewables": 0.0003,
+      "Solar": 0.0183,
+      "Wind": 0.0075
     },
     "2024": {
-      "Bioenergy": 0,
-      "Coal": 0.1302,
-      "Gas": 0.0694,
-      "Hydro": 0.7458,
-      "Nuclear": 0,
-      "Other Fossil": 0.0075,
-      "Other Renewables": 0,
-      "Solar": 0.045,
-      "Wind": 0.0021
+      "Bioenergy": 0.0011,
+      "Coal": 0.1201,
+      "Gas": 0.0887,
+      "Hydro": 0.7128,
+      "Nuclear": 0.0023,
+      "Other Fossil": 0.0135,
+      "Other Renewables": 0.0006,
+      "Solar": 0.0484,
+      "Wind": 0.0125
     },
     "2025": {
-      "Bioenergy": 0,
-      "Coal": 0.0575,
-      "Gas": 0.071,
-      "Hydro": 0.811,
-      "Nuclear": 0,
-      "Other Fossil": 0.007,
-      "Other Renewables": 0,
+      "Bioenergy": 0.0001,
+      "Coal": 0.0577,
+      "Gas": 0.0698,
+      "Hydro": 0.8097,
+      "Nuclear": 0.0003,
+      "Other Fossil": 0.0076,
+      "Other Renewables": 0.0001,
       "Solar": 0.052,
-      "Wind": 0.0015
+      "Wind": 0.0027
     }
   },
   "CR": {
@@ -3307,7 +3307,7 @@
     },
     "2025": {
       "Bioenergy": 0.0073,
-      "Coal": 0.0006,
+      "Coal": 0.0005,
       "Gas": 0.0037,
       "Hydro": 0.6975,
       "Nuclear": 0.0004,
@@ -3690,7 +3690,7 @@
       "Wind": 0.2709
     },
     "2024": {
-      "Bioenergy": 0.0868,
+      "Bioenergy": 0.0867,
       "Coal": 0.2123,
       "Gas": 0.1674,
       "Hydro": 0.0569,
@@ -3701,15 +3701,15 @@
       "Wind": 0.2727
     },
     "2025": {
-      "Bioenergy": 0.0829,
-      "Coal": 0.2288,
-      "Gas": 0.1569,
-      "Hydro": 0.0381,
-      "Nuclear": 0.0067,
-      "Other Fossil": 0.0721,
+      "Bioenergy": 0.0825,
+      "Coal": 0.2278,
+      "Gas": 0.1647,
+      "Hydro": 0.0379,
+      "Nuclear": 0.0066,
+      "Other Fossil": 0.0718,
       "Other Renewables": 0.0002,
-      "Solar": 0.1711,
-      "Wind": 0.2432
+      "Solar": 0.1664,
+      "Wind": 0.242
     }
   },
   "DJ": {
@@ -3850,7 +3850,7 @@
     "2024": {
       "Bioenergy": 0.1064,
       "Coal": 0.0988,
-      "Gas": 0.0711,
+      "Gas": 0.0712,
       "Hydro": 0.0191,
       "Nuclear": 0.0216,
       "Other Fossil": 0.0341,
@@ -3861,12 +3861,12 @@
     "2025": {
       "Bioenergy": 0.1149,
       "Coal": 0.0993,
-      "Gas": 0.0927,
+      "Gas": 0.0929,
       "Hydro": 0.0311,
-      "Nuclear": 0.0355,
+      "Nuclear": 0.0353,
       "Other Fossil": 0.0388,
       "Other Renewables": 0.0012,
-      "Solar": 0.1186,
+      "Solar": 0.1185,
       "Wind": 0.468
     }
   },
@@ -4006,26 +4006,26 @@
       "Wind": 0.0477
     },
     "2024": {
-      "Bioenergy": 0.0092,
-      "Coal": 0.2886,
-      "Gas": 0.3957,
-      "Hydro": 0.0566,
+      "Bioenergy": 0.0087,
+      "Coal": 0.2953,
+      "Gas": 0.4101,
+      "Hydro": 0.059,
       "Nuclear": 0,
-      "Other Fossil": 0.1476,
+      "Other Fossil": 0.1279,
       "Other Renewables": 0,
-      "Solar": 0.0604,
-      "Wind": 0.0421
+      "Solar": 0.0578,
+      "Wind": 0.0412
     },
     "2025": {
-      "Bioenergy": 0.0085,
-      "Coal": 0.2797,
-      "Gas": 0.3602,
-      "Hydro": 0.0508,
+      "Bioenergy": 0.0112,
+      "Coal": 0.2809,
+      "Gas": 0.4113,
+      "Hydro": 0.073,
       "Nuclear": 0,
-      "Other Fossil": 0.2034,
+      "Other Fossil": 0.1011,
       "Other Renewables": 0,
-      "Solar": 0.0636,
-      "Wind": 0.0339
+      "Solar": 0.0742,
+      "Wind": 0.0483
     }
   },
   "DZ": {
@@ -4165,9 +4165,9 @@
     },
     "2024": {
       "Bioenergy": 0.014,
-      "Coal": 0.0014,
+      "Coal": 0.0013,
       "Gas": 0.0384,
-      "Hydro": 0.6581,
+      "Hydro": 0.6582,
       "Nuclear": 0.0008,
       "Other Fossil": 0.2743,
       "Other Renewables": 0.0002,
@@ -4178,9 +4178,9 @@
       "Bioenergy": 0.0002,
       "Coal": 0.001,
       "Gas": 0.0348,
-      "Hydro": 0.7138,
+      "Hydro": 0.7139,
       "Nuclear": 0.0006,
-      "Other Fossil": 0.241,
+      "Other Fossil": 0.2409,
       "Other Renewables": 0.0002,
       "Solar": 0.0026,
       "Wind": 0.0059
@@ -4243,26 +4243,26 @@
       "Wind": 0.1554
     },
     "2024": {
-      "Bioenergy": 0.0675,
+      "Bioenergy": 0.0674,
       "Coal": 0.0508,
-      "Gas": 0.0864,
+      "Gas": 0.0866,
       "Hydro": 0.0657,
-      "Nuclear": 0.0753,
+      "Nuclear": 0.0752,
       "Other Fossil": 0.3037,
       "Other Renewables": 0.0024,
       "Solar": 0.1464,
       "Wind": 0.2017
     },
     "2025": {
-      "Bioenergy": 0.0743,
-      "Coal": 0.0425,
+      "Bioenergy": 0.0739,
+      "Coal": 0.0422,
       "Gas": 0.0747,
-      "Hydro": 0.0506,
-      "Nuclear": 0.0609,
-      "Other Fossil": 0.3375,
+      "Hydro": 0.0503,
+      "Nuclear": 0.0603,
+      "Other Fossil": 0.3355,
       "Other Renewables": 0.002,
-      "Solar": 0.1438,
-      "Wind": 0.2136
+      "Solar": 0.1488,
+      "Wind": 0.2123
     }
   },
   "EG": {
@@ -4335,13 +4335,13 @@
     "2025": {
       "Bioenergy": 0.0006,
       "Coal": 0,
-      "Gas": 0.8109,
-      "Hydro": 0.0589,
+      "Gas": 0.8029,
+      "Hydro": 0.0578,
       "Nuclear": 0,
-      "Other Fossil": 0.0754,
+      "Other Fossil": 0.0747,
       "Other Renewables": 0,
-      "Solar": 0.0291,
-      "Wind": 0.0251
+      "Solar": 0.0298,
+      "Wind": 0.0343
     }
   },
   "ER": {
@@ -4649,15 +4649,15 @@
       "Wind": 0.2352
     },
     "2025": {
-      "Bioenergy": 0.1238,
-      "Coal": 0.0209,
-      "Gas": 0.0294,
-      "Hydro": 0.1672,
-      "Nuclear": 0.323,
-      "Other Fossil": 0.0491,
-      "Other Renewables": 0.0035,
-      "Solar": 0.0205,
-      "Wind": 0.2626
+      "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
     }
   },
   "FJ": {
@@ -5125,13 +5125,13 @@
     "2025": {
       "Bioenergy": 0.0736,
       "Coal": 0.0156,
-      "Gas": 0.3546,
+      "Gas": 0.3548,
       "Hydro": 0.0311,
-      "Nuclear": 0.1576,
+      "Nuclear": 0.1575,
       "Other Fossil": 0.0186,
       "Other Renewables": 0.0008,
-      "Solar": 0.0761,
-      "Wind": 0.272
+      "Solar": 0.076,
+      "Wind": 0.2719
     }
   },
   "GD": {
@@ -5272,7 +5272,7 @@
     "2024": {
       "Bioenergy": 0.0016,
       "Coal": 0.0406,
-      "Gas": 0.2034,
+      "Gas": 0.2033,
       "Hydro": 0.7311,
       "Nuclear": 0.0039,
       "Other Fossil": 0.0004,
@@ -5993,14 +5993,14 @@
     },
     "2025": {
       "Bioenergy": 0.0009,
-      "Coal": 0.0705,
-      "Gas": 0.4265,
+      "Coal": 0.0704,
+      "Gas": 0.4263,
       "Hydro": 0.0446,
       "Nuclear": 0.0056,
       "Other Fossil": 0.0007,
       "Other Renewables": 0.0002,
-      "Solar": 0.2415,
-      "Wind": 0.2095
+      "Solar": 0.2419,
+      "Wind": 0.2094
     }
   },
   "GT": {
@@ -6377,22 +6377,22 @@
     },
     "2024": {
       "Bioenergy": 0.0081,
-      "Coal": 0.5641,
+      "Coal": 0.5642,
       "Gas": 0.3397,
-      "Hydro": 0.0303,
+      "Hydro": 0.0302,
       "Nuclear": 0.0131,
       "Other Fossil": 0.0051,
       "Other Renewables": 0.0013,
-      "Solar": 0.0197,
+      "Solar": 0.0198,
       "Wind": 0.0185
     },
     "2025": {
       "Bioenergy": 0.0081,
       "Coal": 0.5608,
       "Gas": 0.3395,
-      "Hydro": 0.023,
+      "Hydro": 0.0231,
       "Nuclear": 0.0145,
-      "Other Fossil": 0.0051,
+      "Other Fossil": 0.0052,
       "Other Renewables": 0.0014,
       "Solar": 0.0245,
       "Wind": 0.023
@@ -6469,11 +6469,11 @@
       "Bioenergy": 0.1282,
       "Coal": 0.0051,
       "Gas": 0.0049,
-      "Hydro": 0.2236,
+      "Hydro": 0.2237,
       "Nuclear": 0.0004,
       "Other Fossil": 0.4371,
       "Other Renewables": 0.0264,
-      "Solar": 0.1,
+      "Solar": 0.1001,
       "Wind": 0.0738
     }
   },
@@ -6534,25 +6534,25 @@
       "Wind": 0.1578
     },
     "2024": {
-      "Bioenergy": 0.04,
-      "Coal": 0.0743,
+      "Bioenergy": 0.0399,
+      "Coal": 0.0744,
       "Gas": 0.2146,
       "Hydro": 0.3472,
       "Nuclear": 0.0543,
-      "Other Fossil": 0.0098,
+      "Other Fossil": 0.0097,
       "Other Renewables": 0.0163,
       "Solar": 0.0702,
       "Wind": 0.1734
     },
     "2025": {
       "Bioenergy": 0.0402,
-      "Coal": 0.0334,
-      "Gas": 0.1998,
-      "Hydro": 0.356,
-      "Nuclear": 0.049,
+      "Coal": 0.0333,
+      "Gas": 0.2003,
+      "Hydro": 0.3559,
+      "Nuclear": 0.0488,
       "Other Fossil": 0.011,
       "Other Renewables": 0.0162,
-      "Solar": 0.0812,
+      "Solar": 0.0811,
       "Wind": 0.2132
     }
   },
@@ -6692,22 +6692,22 @@
       "Wind": 0.047
     },
     "2024": {
-      "Bioenergy": 0.0265,
+      "Bioenergy": 0.0264,
       "Coal": 0.088,
-      "Gas": 0.1911,
+      "Gas": 0.1912,
       "Hydro": 0.0455,
       "Nuclear": 0.3711,
-      "Other Fossil": 0.0178,
-      "Other Renewables": 0.004,
+      "Other Fossil": 0.0177,
+      "Other Renewables": 0.0041,
       "Solar": 0.2113,
       "Wind": 0.0448
     },
     "2025": {
       "Bioenergy": 0.0384,
       "Coal": 0.0643,
-      "Gas": 0.2043,
+      "Gas": 0.2046,
       "Hydro": 0.0387,
-      "Nuclear": 0.3756,
+      "Nuclear": 0.3754,
       "Other Fossil": 0.0173,
       "Other Renewables": 0.0038,
       "Solar": 0.2191,
@@ -6772,7 +6772,7 @@
     },
     "2024": {
       "Bioenergy": 0.0411,
-      "Coal": 0.5903,
+      "Coal": 0.5904,
       "Gas": 0.2103,
       "Hydro": 0.0719,
       "Nuclear": 0.0003,
@@ -6840,19 +6840,19 @@
     },
     "2023": {
       "Bioenergy": 0.0069,
-      "Coal": 0.054,
-      "Gas": 0.4508,
-      "Hydro": 0.0485,
+      "Coal": 0.0539,
+      "Gas": 0.4505,
+      "Hydro": 0.0484,
       "Nuclear": 0.0246,
-      "Other Fossil": 0.036,
+      "Other Fossil": 0.0359,
       "Other Renewables": 0.0008,
-      "Solar": 0.0191,
+      "Solar": 0.0194,
       "Wind": 0.3594
     },
     "2024": {
       "Bioenergy": 0.0079,
       "Coal": 0.0486,
-      "Gas": 0.4406,
+      "Gas": 0.4407,
       "Hydro": 0.0501,
       "Nuclear": 0.0319,
       "Other Fossil": 0.0387,
@@ -6861,15 +6861,15 @@
       "Wind": 0.3483
     },
     "2025": {
-      "Bioenergy": 0.0069,
-      "Coal": 0.0477,
-      "Gas": 0.4598,
-      "Hydro": 0.0494,
-      "Nuclear": 0.0268,
-      "Other Fossil": 0.0474,
-      "Other Renewables": 0.0009,
-      "Solar": 0.02,
-      "Wind": 0.3409
+      "Bioenergy": 0.0083,
+      "Coal": 0.0538,
+      "Gas": 0.4177,
+      "Hydro": 0.0474,
+      "Nuclear": 0.0342,
+      "Other Fossil": 0.0405,
+      "Other Renewables": 0.0012,
+      "Solar": 0.0405,
+      "Wind": 0.3564
     }
   },
   "IL": {
@@ -7179,10 +7179,10 @@
     "2025": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.64,
-      "Hydro": 0.031,
+      "Gas": 0.7754,
+      "Hydro": 0.0349,
       "Nuclear": 0,
-      "Other Fossil": 0.3291,
+      "Other Fossil": 0.1896,
       "Other Renewables": 0,
       "Solar": 0,
       "Wind": 0
@@ -7326,7 +7326,7 @@
     "2024": {
       "Bioenergy": 0.0554,
       "Coal": 0.035,
-      "Gas": 0.408,
+      "Gas": 0.4081,
       "Hydro": 0.1861,
       "Nuclear": 0.0346,
       "Other Fossil": 0.0335,
@@ -7337,9 +7337,9 @@
     "2025": {
       "Bioenergy": 0.0546,
       "Coal": 0.0382,
-      "Gas": 0.4996,
+      "Gas": 0.4998,
       "Hydro": 0.1144,
-      "Nuclear": 0.0347,
+      "Nuclear": 0.0346,
       "Other Fossil": 0.0301,
       "Other Renewables": 0.0191,
       "Solar": 0.0818,
@@ -7664,21 +7664,21 @@
   },
   "KG": {
     "2019": {
-      "Bioenergy": 0,
-      "Coal": 0.0741,
-      "Gas": 0.004,
-      "Hydro": 0.9192,
-      "Nuclear": 0,
-      "Other Fossil": 0.0027,
-      "Other Renewables": 0,
-      "Solar": 0,
-      "Wind": 0
+      "Bioenergy": 0.0002,
+      "Coal": 0.0823,
+      "Gas": 0.0058,
+      "Hydro": 0.9068,
+      "Nuclear": 0.0008,
+      "Other Fossil": 0.0028,
+      "Other Renewables": 0.0001,
+      "Solar": 0.0004,
+      "Wind": 0.0007
     },
     "2020": {
       "Bioenergy": 0.0003,
-      "Coal": 0.0924,
-      "Gas": 0.006,
-      "Hydro": 0.8954,
+      "Coal": 0.0932,
+      "Gas": 0.0061,
+      "Hydro": 0.8944,
       "Nuclear": 0.0009,
       "Other Fossil": 0.0034,
       "Other Renewables": 0.0001,
@@ -7687,20 +7687,20 @@
     },
     "2021": {
       "Bioenergy": 0.0007,
-      "Coal": 0.1427,
-      "Gas": 0.015,
-      "Hydro": 0.8342,
+      "Coal": 0.1418,
+      "Gas": 0.0151,
+      "Hydro": 0.8343,
       "Nuclear": 0.0019,
-      "Other Fossil": 0.0017,
+      "Other Fossil": 0.0024,
       "Other Renewables": 0.0002,
       "Solar": 0.0015,
       "Wind": 0.0022
     },
     "2022": {
       "Bioenergy": 0.0018,
-      "Coal": 0.1552,
+      "Coal": 0.1538,
       "Gas": 0.0167,
-      "Hydro": 0.8089,
+      "Hydro": 0.8103,
       "Nuclear": 0.0046,
       "Other Fossil": 0.0022,
       "Other Renewables": 0.0004,
@@ -7709,36 +7709,36 @@
     },
     "2023": {
       "Bioenergy": 0.0017,
-      "Coal": 0.1593,
-      "Gas": 0.0155,
-      "Hydro": 0.8071,
+      "Coal": 0.1592,
+      "Gas": 0.0147,
+      "Hydro": 0.8072,
       "Nuclear": 0.004,
-      "Other Fossil": 0.0029,
+      "Other Fossil": 0.0037,
       "Other Renewables": 0.0004,
       "Solar": 0.0038,
       "Wind": 0.0053
     },
     "2024": {
       "Bioenergy": 0.0019,
-      "Coal": 0.1306,
-      "Gas": 0.0169,
-      "Hydro": 0.8151,
+      "Coal": 0.1273,
+      "Gas": 0.0175,
+      "Hydro": 0.8114,
       "Nuclear": 0.0047,
-      "Other Fossil": 0.017,
+      "Other Fossil": 0.0235,
       "Other Renewables": 0.0005,
-      "Solar": 0.0066,
+      "Solar": 0.0065,
       "Wind": 0.0067
     },
     "2025": {
       "Bioenergy": 0.0016,
-      "Coal": 0.0984,
-      "Gas": 0.0156,
-      "Hydro": 0.8402,
+      "Coal": 0.0975,
+      "Gas": 0.0155,
+      "Hydro": 0.8333,
       "Nuclear": 0.0043,
-      "Other Fossil": 0.0254,
+      "Other Fossil": 0.0335,
       "Other Renewables": 0.0004,
-      "Solar": 0.0072,
-      "Wind": 0.0069
+      "Solar": 0.0071,
+      "Wind": 0.0068
     }
   },
   "KH": {
@@ -7799,9 +7799,9 @@
     },
     "2024": {
       "Bioenergy": 0.0136,
-      "Coal": 0.4629,
+      "Coal": 0.463,
       "Gas": 0.0248,
-      "Hydro": 0.3809,
+      "Hydro": 0.3808,
       "Nuclear": 0.0132,
       "Other Fossil": 0.0552,
       "Other Renewables": 0.0013,
@@ -7812,12 +7812,12 @@
       "Bioenergy": 0.0136,
       "Coal": 0.4596,
       "Gas": 0.0246,
-      "Hydro": 0.3736,
+      "Hydro": 0.3737,
       "Nuclear": 0.0146,
       "Other Fossil": 0.0552,
       "Other Renewables": 0.0014,
       "Solar": 0.0342,
-      "Wind": 0.0231
+      "Wind": 0.0232
     }
   },
   "KI": {
@@ -8204,14 +8204,14 @@
       "Wind": 0.0057
     },
     "2025": {
-      "Bioenergy": 0.0199,
-      "Coal": 0.2159,
-      "Gas": 0.3081,
-      "Hydro": 0.0042,
-      "Nuclear": 0.359,
-      "Other Fossil": 0.0078,
-      "Other Renewables": 0.0157,
-      "Solar": 0.0616,
+      "Bioenergy": 0.0204,
+      "Coal": 0.2124,
+      "Gas": 0.3064,
+      "Hydro": 0.0047,
+      "Nuclear": 0.3549,
+      "Other Fossil": 0.0077,
+      "Other Renewables": 0.016,
+      "Solar": 0.0695,
       "Wind": 0.0079
     }
   },
@@ -8442,14 +8442,14 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Coal": 0.5698,
-      "Gas": 0.2879,
-      "Hydro": 0.0653,
+      "Coal": 0.5545,
+      "Gas": 0.2801,
+      "Hydro": 0.0858,
       "Nuclear": 0,
-      "Other Fossil": 0.0213,
+      "Other Fossil": 0.0208,
       "Other Renewables": 0,
-      "Solar": 0.0133,
-      "Wind": 0.0426
+      "Solar": 0.0153,
+      "Wind": 0.0435
     }
   },
   "LA": {
@@ -8985,22 +8985,22 @@
     "2024": {
       "Bioenergy": 0.0307,
       "Coal": 0.0607,
-      "Gas": 0.1656,
+      "Gas": 0.1658,
       "Hydro": 0.1099,
-      "Nuclear": 0.0913,
+      "Nuclear": 0.0912,
       "Other Fossil": 0.0841,
       "Other Renewables": 0.0029,
-      "Solar": 0.14,
-      "Wind": 0.3148
+      "Solar": 0.1399,
+      "Wind": 0.3149
     },
     "2025": {
       "Bioenergy": 0.0206,
-      "Coal": 0.0368,
-      "Gas": 0.2457,
+      "Coal": 0.0367,
+      "Gas": 0.246,
       "Hydro": 0.0642,
-      "Nuclear": 0.0509,
+      "Nuclear": 0.0507,
       "Other Fossil": 0.109,
-      "Other Renewables": 0.0016,
+      "Other Renewables": 0.0017,
       "Solar": 0.1358,
       "Wind": 0.3352
     }
@@ -9062,11 +9062,11 @@
       "Wind": 0.2004
     },
     "2024": {
-      "Bioenergy": 0.0735,
+      "Bioenergy": 0.0734,
       "Coal": 0.0982,
-      "Gas": 0.1811,
+      "Gas": 0.1813,
       "Hydro": 0.1559,
-      "Nuclear": 0.148,
+      "Nuclear": 0.1479,
       "Other Fossil": 0.0371,
       "Other Renewables": 0.0047,
       "Solar": 0.1157,
@@ -9074,14 +9074,14 @@
     },
     "2025": {
       "Bioenergy": 0.0732,
-      "Coal": 0.0983,
-      "Gas": 0.1916,
-      "Hydro": 0.1343,
-      "Nuclear": 0.1424,
+      "Coal": 0.0981,
+      "Gas": 0.1927,
+      "Hydro": 0.1341,
+      "Nuclear": 0.1418,
       "Other Fossil": 0.0407,
       "Other Renewables": 0.0048,
-      "Solar": 0.1366,
-      "Wind": 0.1782
+      "Solar": 0.1365,
+      "Wind": 0.1781
     }
   },
   "LV": {
@@ -9143,24 +9143,24 @@
     "2024": {
       "Bioenergy": 0.0543,
       "Coal": 0.0391,
-      "Gas": 0.2659,
+      "Gas": 0.266,
       "Hydro": 0.4251,
-      "Nuclear": 0.0587,
-      "Other Fossil": 0.0103,
+      "Nuclear": 0.0586,
+      "Other Fossil": 0.0102,
       "Other Renewables": 0.0019,
-      "Solar": 0.0774,
+      "Solar": 0.0773,
       "Wind": 0.0675
     },
     "2025": {
-      "Bioenergy": 0.0617,
-      "Coal": 0.0161,
-      "Gas": 0.294,
-      "Hydro": 0.4502,
+      "Bioenergy": 0.0621,
+      "Coal": 0.0162,
+      "Gas": 0.2963,
+      "Hydro": 0.4565,
       "Nuclear": 0.0259,
-      "Other Fossil": 0.0097,
+      "Other Fossil": 0.0032,
       "Other Renewables": 0.0009,
-      "Solar": 0.0965,
-      "Wind": 0.045
+      "Solar": 0.0904,
+      "Wind": 0.0485
     }
   },
   "LY": {
@@ -9391,7 +9391,7 @@
     "2025": {
       "Bioenergy": 0.0006,
       "Coal": 0.0028,
-      "Gas": 0.9216,
+      "Gas": 0.9217,
       "Hydro": 0.0452,
       "Nuclear": 0.0041,
       "Other Fossil": 0.0005,
@@ -9464,19 +9464,19 @@
       "Nuclear": 0.0289,
       "Other Fossil": 0.0029,
       "Other Renewables": 0.0009,
-      "Solar": 0.0317,
+      "Solar": 0.0316,
       "Wind": 0.0916
     },
     "2025": {
       "Bioenergy": 0.0105,
-      "Coal": 0.2693,
-      "Gas": 0.0766,
-      "Hydro": 0.4016,
-      "Nuclear": 0.0684,
-      "Other Fossil": 0.0081,
+      "Coal": 0.2692,
+      "Gas": 0.0773,
+      "Hydro": 0.4015,
+      "Nuclear": 0.0681,
+      "Other Fossil": 0.0082,
       "Other Renewables": 0.0024,
-      "Solar": 0.0379,
-      "Wind": 0.1253
+      "Solar": 0.0377,
+      "Wind": 0.1251
     }
   },
   "MG": {
@@ -9617,9 +9617,9 @@
     "2024": {
       "Bioenergy": 0.0191,
       "Coal": 0.3936,
-      "Gas": 0.2328,
+      "Gas": 0.2329,
       "Hydro": 0.2409,
-      "Nuclear": 0.0183,
+      "Nuclear": 0.0182,
       "Other Fossil": 0.0019,
       "Other Renewables": 0.0006,
       "Solar": 0.0501,
@@ -9627,10 +9627,10 @@
     },
     "2025": {
       "Bioenergy": 0.0093,
-      "Coal": 0.3956,
-      "Gas": 0.2675,
-      "Hydro": 0.1772,
-      "Nuclear": 0.0467,
+      "Coal": 0.3955,
+      "Gas": 0.2679,
+      "Hydro": 0.1771,
+      "Nuclear": 0.0465,
       "Other Fossil": 0.0055,
       "Other Renewables": 0.0016,
       "Solar": 0.0432,
@@ -9932,23 +9932,23 @@
     },
     "2024": {
       "Bioenergy": 0.0557,
-      "Coal": 0.4675,
-      "Gas": 0.1613,
-      "Hydro": 0.1031,
+      "Coal": 0.4676,
+      "Gas": 0.1612,
+      "Hydro": 0.103,
       "Nuclear": 0.0448,
       "Other Fossil": 0.0341,
       "Other Renewables": 0.0045,
-      "Solar": 0.066,
+      "Solar": 0.0661,
       "Wind": 0.063
     },
     "2025": {
-      "Bioenergy": 0.0557,
-      "Coal": 0.4562,
-      "Gas": 0.1606,
-      "Hydro": 0.0786,
+      "Bioenergy": 0.0558,
+      "Coal": 0.4561,
+      "Gas": 0.1604,
+      "Hydro": 0.0788,
       "Nuclear": 0.0494,
-      "Other Fossil": 0.0342,
-      "Other Renewables": 0.0049,
+      "Other Fossil": 0.0343,
+      "Other Renewables": 0.0048,
       "Solar": 0.0821,
       "Wind": 0.0783
     }
@@ -10247,11 +10247,11 @@
       "Wind": 0.02
     },
     "2024": {
-      "Bioenergy": 0.0064,
+      "Bioenergy": 0.0063,
       "Coal": 0.0301,
-      "Gas": 0.7037,
+      "Gas": 0.7038,
       "Hydro": 0.0407,
-      "Nuclear": 0.0462,
+      "Nuclear": 0.0461,
       "Other Fossil": 0.0069,
       "Other Renewables": 0.0015,
       "Solar": 0.1364,
@@ -10259,14 +10259,14 @@
     },
     "2025": {
       "Bioenergy": 0.0074,
-      "Coal": 0.034,
-      "Gas": 0.6574,
-      "Hydro": 0.043,
-      "Nuclear": 0.0503,
+      "Coal": 0.0339,
+      "Gas": 0.6578,
+      "Hydro": 0.0429,
+      "Nuclear": 0.0501,
       "Other Fossil": 0.0297,
       "Other Renewables": 0.0017,
       "Solar": 0.1456,
-      "Wind": 0.0309
+      "Wind": 0.0308
     }
   },
   "MU": {
@@ -11128,14 +11128,14 @@
     },
     "2025": {
       "Bioenergy": 0.1683,
-      "Coal": 0.0029,
+      "Coal": 0.0028,
       "Gas": 0.0193,
-      "Hydro": 0.0871,
+      "Hydro": 0.0873,
       "Nuclear": 0.0017,
-      "Other Fossil": 0.398,
+      "Other Fossil": 0.3978,
       "Other Renewables": 0.1562,
       "Solar": 0.0133,
-      "Wind": 0.1533
+      "Wind": 0.1534
     }
   },
   "NL": {
@@ -11195,26 +11195,26 @@
       "Wind": 0.2517
     },
     "2024": {
-      "Bioenergy": 0.0533,
-      "Coal": 0.0806,
-      "Gas": 0.3595,
+      "Bioenergy": 0.0496,
+      "Coal": 0.081,
+      "Gas": 0.3638,
       "Hydro": 0.0018,
-      "Nuclear": 0.0293,
-      "Other Fossil": 0.0129,
+      "Nuclear": 0.0295,
+      "Other Fossil": 0.0117,
       "Other Renewables": 0.0048,
-      "Solar": 0.1846,
-      "Wind": 0.2732
+      "Solar": 0.182,
+      "Wind": 0.2757
     },
     "2025": {
       "Bioenergy": 0.0669,
       "Coal": 0.1025,
-      "Gas": 0.3754,
+      "Gas": 0.3746,
       "Hydro": 0.0009,
       "Nuclear": 0.0241,
-      "Other Fossil": 0.0099,
+      "Other Fossil": 0.011,
       "Other Renewables": 0.0044,
-      "Solar": 0.1964,
-      "Wind": 0.2195
+      "Solar": 0.1962,
+      "Wind": 0.2194
     }
   },
   "NO": {
@@ -11288,12 +11288,12 @@
       "Bioenergy": 0,
       "Coal": 0,
       "Gas": 0.0066,
-      "Hydro": 0.9059,
+      "Hydro": 0.9057,
       "Nuclear": 0,
       "Other Fossil": 0.001,
       "Other Renewables": 0.0026,
       "Solar": 0,
-      "Wind": 0.084
+      "Wind": 0.0841
     }
   },
   "NP": {
@@ -11355,8 +11355,8 @@
     "2024": {
       "Bioenergy": 0.0044,
       "Coal": 0.1139,
-      "Gas": 0.0205,
-      "Hydro": 0.8051,
+      "Gas": 0.0204,
+      "Hydro": 0.805,
       "Nuclear": 0.0109,
       "Other Fossil": 0.0012,
       "Other Renewables": 0.0011,
@@ -11365,14 +11365,14 @@
     },
     "2025": {
       "Bioenergy": 0.0044,
-      "Coal": 0.1112,
-      "Gas": 0.0203,
+      "Coal": 0.1111,
+      "Gas": 0.0202,
       "Hydro": 0.7991,
       "Nuclear": 0.012,
       "Other Fossil": 0.0012,
       "Other Renewables": 0.0012,
       "Solar": 0.0303,
-      "Wind": 0.0203
+      "Wind": 0.0204
     }
   },
   "NR": {
@@ -11602,14 +11602,14 @@
     },
     "2025": {
       "Bioenergy": 0.0006,
-      "Coal": 0.0566,
-      "Gas": 0.1294,
-      "Hydro": 0.4993,
+      "Coal": 0.0535,
+      "Gas": 0.1265,
+      "Hydro": 0.5041,
       "Nuclear": 0,
       "Other Fossil": 0,
-      "Other Renewables": 0.2329,
+      "Other Renewables": 0.2328,
       "Solar": 0,
-      "Wind": 0.0811
+      "Wind": 0.0824
     }
   },
   "OM": {
@@ -11840,13 +11840,13 @@
     "2025": {
       "Bioenergy": 0.0051,
       "Coal": 0,
-      "Gas": 0.2771,
-      "Hydro": 0.6297,
+      "Gas": 0.2855,
+      "Hydro": 0.6228,
       "Nuclear": 0,
       "Other Fossil": 0.002,
       "Other Renewables": 0,
-      "Solar": 0.0235,
-      "Wind": 0.0626
+      "Solar": 0.0239,
+      "Wind": 0.0607
     }
   },
   "PF": {
@@ -12234,14 +12234,14 @@
     },
     "2025": {
       "Bioenergy": 0.0196,
-      "Coal": 0.5331,
-      "Gas": 0.1236,
+      "Coal": 0.5328,
+      "Gas": 0.1264,
       "Hydro": 0.0108,
-      "Nuclear": 0.0011,
-      "Other Fossil": 0.0557,
-      "Other Renewables": 0.0024,
-      "Solar": 0.1153,
-      "Wind": 0.1385
+      "Nuclear": 0.001,
+      "Other Fossil": 0.0535,
+      "Other Renewables": 0.0033,
+      "Solar": 0.1152,
+      "Wind": 0.1375
     }
   },
   "PM": {
@@ -12540,20 +12540,20 @@
     "2024": {
       "Bioenergy": 0.0664,
       "Coal": 0.0288,
-      "Gas": 0.1455,
+      "Gas": 0.1456,
       "Hydro": 0.273,
       "Nuclear": 0.0445,
       "Other Fossil": 0.0092,
       "Other Renewables": 0.0014,
-      "Solar": 0.1291,
+      "Solar": 0.129,
       "Wind": 0.3021
     },
     "2025": {
       "Bioenergy": 0.055,
-      "Coal": 0.0093,
-      "Gas": 0.1406,
+      "Coal": 0.0092,
+      "Gas": 0.1407,
       "Hydro": 0.3681,
-      "Nuclear": 0.0132,
+      "Nuclear": 0.0131,
       "Other Fossil": 0.0052,
       "Other Renewables": 0.0004,
       "Solar": 0.1166,
@@ -12856,7 +12856,7 @@
     "2024": {
       "Bioenergy": 0.0096,
       "Coal": 0.1312,
-      "Gas": 0.1951,
+      "Gas": 0.1952,
       "Hydro": 0.2618,
       "Nuclear": 0.2036,
       "Other Fossil": 0.0014,
@@ -12867,12 +12867,12 @@
     "2025": {
       "Bioenergy": 0.011,
       "Coal": 0.1344,
-      "Gas": 0.1881,
+      "Gas": 0.1882,
       "Hydro": 0.2405,
-      "Nuclear": 0.2051,
+      "Nuclear": 0.205,
       "Other Fossil": 0.002,
       "Other Renewables": 0.0006,
-      "Solar": 0.0924,
+      "Solar": 0.0923,
       "Wind": 0.1259
     }
   },
@@ -12946,12 +12946,12 @@
     "2025": {
       "Bioenergy": 0.0081,
       "Coal": 0.5885,
-      "Gas": 0.0587,
+      "Gas": 0.0588,
       "Hydro": 0.2852,
       "Nuclear": 0.0053,
       "Other Fossil": 0.0073,
       "Other Renewables": 0.0002,
-      "Solar": 0.0031,
+      "Solar": 0.003,
       "Wind": 0.0437
     }
   },
@@ -13577,13 +13577,13 @@
     },
     "2025": {
       "Bioenergy": 0.0001,
-      "Coal": 0.0024,
-      "Gas": 0.948,
+      "Coal": 0.0022,
+      "Gas": 0.9513,
       "Hydro": 0.0004,
-      "Nuclear": 0.0003,
-      "Other Fossil": 0.0229,
+      "Nuclear": 0.0002,
+      "Other Fossil": 0.0214,
       "Other Renewables": 0,
-      "Solar": 0.0255,
+      "Solar": 0.0239,
       "Wind": 0.0004
     }
   },
@@ -13723,7 +13723,7 @@
       "Wind": 0.0056
     },
     "2024": {
-      "Bioenergy": 0.0081,
+      "Bioenergy": 0.008,
       "Coal": 0.2055,
       "Gas": 0.0344,
       "Hydro": 0.3229,
@@ -14840,10 +14840,10 @@
       "Wind": 0.0268
     },
     "2025": {
-      "Bioenergy": 0.0629,
+      "Bioenergy": 0.063,
       "Coal": 0.2185,
       "Gas": 0.5872,
-      "Hydro": 0.0501,
+      "Hydro": 0.0502,
       "Nuclear": 0.007,
       "Other Fossil": 0.0008,
       "Other Renewables": 0.0007,
@@ -14854,9 +14854,9 @@
   "TJ": {
     "2019": {
       "Bioenergy": 0,
-      "Coal": 0.0604,
-      "Gas": 0.0126,
-      "Hydro": 0.927,
+      "Coal": 0.067,
+      "Gas": 0.0141,
+      "Hydro": 0.9188,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
@@ -14865,9 +14865,9 @@
     },
     "2020": {
       "Bioenergy": 0,
-      "Coal": 0.0702,
-      "Gas": 0.0143,
-      "Hydro": 0.9155,
+      "Coal": 0.0736,
+      "Gas": 0.0149,
+      "Hydro": 0.9116,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
@@ -14909,25 +14909,25 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Coal": 0.0414,
-      "Gas": 0.0087,
-      "Hydro": 0.9499,
-      "Nuclear": 0,
+      "Coal": 0.0564,
+      "Gas": 0.013,
+      "Hydro": 0.9303,
+      "Nuclear": 0.0001,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0,
-      "Wind": 0
+      "Solar": 0.0001,
+      "Wind": 0.0001
     },
     "2025": {
-      "Bioenergy": 0,
-      "Coal": 0,
-      "Gas": 0,
-      "Hydro": 1,
-      "Nuclear": 0,
-      "Other Fossil": 0,
-      "Other Renewables": 0,
-      "Solar": 0,
-      "Wind": 0
+      "Bioenergy": 0.0003,
+      "Coal": 0.1129,
+      "Gas": 0.0244,
+      "Hydro": 0.8581,
+      "Nuclear": 0.0009,
+      "Other Fossil": 0.0001,
+      "Other Renewables": 0.0001,
+      "Solar": 0.0016,
+      "Wind": 0.0015
     }
   },
   "TL": {
@@ -15314,15 +15314,15 @@
       "Wind": 0.107
     },
     "2025": {
-      "Bioenergy": 0.0252,
-      "Coal": 0.3233,
-      "Gas": 0.2093,
-      "Hydro": 0.2065,
+      "Bioenergy": 0.0251,
+      "Coal": 0.3225,
+      "Gas": 0.2088,
+      "Hydro": 0.206,
       "Nuclear": 0.0003,
-      "Other Fossil": 0.0031,
-      "Other Renewables": 0.0333,
-      "Solar": 0.0926,
-      "Wind": 0.1064
+      "Other Fossil": 0.0033,
+      "Other Renewables": 0.0332,
+      "Solar": 0.0945,
+      "Wind": 0.1061
     }
   },
   "TT": {
@@ -15789,14 +15789,14 @@
     },
     "2025": {
       "Bioenergy": 0.0106,
-      "Coal": 0.1624,
-      "Gas": 0.3707,
+      "Coal": 0.1623,
+      "Gas": 0.3706,
       "Hydro": 0.0611,
-      "Nuclear": 0.1774,
-      "Other Fossil": 0.0075,
+      "Nuclear": 0.1773,
+      "Other Fossil": 0.0076,
       "Other Renewables": 0.0042,
-      "Solar": 0.0834,
-      "Wind": 0.1227
+      "Solar": 0.0837,
+      "Wind": 0.1226
     }
   },
   "UY": {
@@ -15868,11 +15868,11 @@
     },
     "2025": {
       "Bioenergy": 0.146,
-      "Coal": 0.0027,
+      "Coal": 0.0026,
       "Gas": 0.0361,
-      "Hydro": 0.413,
+      "Hydro": 0.4133,
       "Nuclear": 0.0017,
-      "Other Fossil": 0.0144,
+      "Other Fossil": 0.0142,
       "Other Renewables": 0.0005,
       "Solar": 0.0463,
       "Wind": 0.3393
@@ -16342,14 +16342,14 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Coal": 0.5885,
-      "Gas": 0.0748,
-      "Hydro": 0.1885,
+      "Coal": 0.5819,
+      "Gas": 0.0699,
+      "Hydro": 0.2066,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0971,
-      "Wind": 0.0511
+      "Solar": 0.0946,
+      "Wind": 0.047
     }
   },
   "VU": {
@@ -16578,15 +16578,15 @@
       "Wind": 0.0647
     },
     "2025": {
-      "Bioenergy": 0.006,
-      "Coal": 0.7389,
-      "Gas": 0.0521,
-      "Hydro": 0.0669,
-      "Nuclear": 0.0417,
-      "Other Fossil": 0.0048,
-      "Other Renewables": 0.0014,
-      "Solar": 0.0133,
-      "Wind": 0.075
+      "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
     }
   },
   "YE": {
@@ -16726,25 +16726,25 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Coal": 0.8145,
+      "Coal": 0.8139,
       "Gas": 0.0004,
       "Hydro": 0.0047,
       "Nuclear": 0.0331,
       "Other Fossil": 0.0142,
       "Other Renewables": 0.001,
-      "Solar": 0.0848,
+      "Solar": 0.0854,
       "Wind": 0.0472
     },
     "2025": {
       "Bioenergy": 0,
-      "Coal": 0.7911,
+      "Coal": 0.7892,
       "Gas": 0,
-      "Hydro": 0.0041,
-      "Nuclear": 0.0388,
-      "Other Fossil": 0.0321,
-      "Other Renewables": 0.001,
-      "Solar": 0.0913,
-      "Wind": 0.0416
+      "Hydro": 0.0104,
+      "Nuclear": 0.0427,
+      "Other Fossil": 0.0276,
+      "Other Renewables": 0.0006,
+      "Solar": 0.0876,
+      "Wind": 0.0419
     }
   },
   "ZM": {