@digital4better/data 1.1.62 → 1.1.64

package/data/mix/country-yearly.json

@@ -74,18 +74,18 @@
       "Gas": 0.0994,
       "Hydro": 0.2539,
       "Nuclear": 0.0439,
-      "Other Fossil": 0.0252,
+      "Other Fossil": 0.0253,
       "Other Renewables": 0.0046,
       "Solar": 0.0335,
-      "Wind": 0.0337
+      "Wind": 0.0338
     },
     "2020": {
       "Bioenergy": 0.0139,
       "Coal": 0.4856,
       "Gas": 0.0967,
-      "Hydro": 0.2562,
+      "Hydro": 0.2561,
       "Nuclear": 0.0438,
-      "Other Fossil": 0.0243,
+      "Other Fossil": 0.0244,
       "Other Renewables": 0.004,
       "Solar": 0.0381,
       "Wind": 0.0373
@@ -94,7 +94,7 @@
       "Bioenergy": 0.0156,
       "Coal": 0.4837,
       "Gas": 0.0913,
-      "Hydro": 0.2474,
+      "Hydro": 0.2473,
       "Nuclear": 0.0439,
       "Other Fossil": 0.0247,
       "Other Renewables": 0.0039,
@@ -103,19 +103,19 @@
     },
     "2022": {
       "Bioenergy": 0.017,
-      "Coal": 0.4744,
+      "Coal": 0.4743,
       "Gas": 0.0869,
-      "Hydro": 0.2468,
+      "Hydro": 0.2469,
       "Nuclear": 0.0438,
       "Other Fossil": 0.0249,
       "Other Renewables": 0.004,
-      "Solar": 0.0501,
+      "Solar": 0.0502,
       "Wind": 0.0521
     },
     "2023": {
       "Bioenergy": 0.0174,
-      "Coal": 0.478,
-      "Gas": 0.0827,
+      "Coal": 0.4779,
+      "Gas": 0.0828,
       "Hydro": 0.235,
       "Nuclear": 0.0439,
       "Other Fossil": 0.0227,
@@ -125,14 +125,14 @@
     },
     "2024": {
       "Bioenergy": 0.0165,
-      "Coal": 0.4616,
-      "Gas": 0.08,
-      "Hydro": 0.2471,
+      "Coal": 0.4618,
+      "Gas": 0.0803,
+      "Hydro": 0.2437,
       "Nuclear": 0.0422,
       "Other Fossil": 0.0216,
       "Other Renewables": 0.004,
-      "Solar": 0.0724,
-      "Wind": 0.0547
+      "Solar": 0.0719,
+      "Wind": 0.058
     }
   },
   "AG": {
@@ -250,25 +250,25 @@
     },
     "2023": {
       "Bioenergy": 0.0088,
-      "Coal": 0.0466,
+      "Coal": 0.0465,
       "Gas": 0.0762,
       "Hydro": 0.7354,
       "Nuclear": 0.0629,
       "Other Fossil": 0.0063,
       "Other Renewables": 0.0021,
-      "Solar": 0.0218,
+      "Solar": 0.0219,
       "Wind": 0.0399
     },
     "2024": {
-      "Bioenergy": 0.0089,
-      "Coal": 0.0411,
-      "Gas": 0.0697,
-      "Hydro": 0.7405,
-      "Nuclear": 0.0633,
+      "Bioenergy": 0.009,
+      "Coal": 0.0412,
+      "Gas": 0.0699,
+      "Hydro": 0.7407,
+      "Nuclear": 0.0634,
       "Other Fossil": 0.0062,
       "Other Renewables": 0.002,
-      "Solar": 0.0293,
-      "Wind": 0.039
+      "Solar": 0.0283,
+      "Wind": 0.0393
     }
   },
   "AM": {
@@ -465,14 +465,14 @@
     },
     "2024": {
       "Bioenergy": 0.0089,
-      "Coal": 0.0076,
-      "Gas": 0.5131,
-      "Hydro": 0.2418,
-      "Nuclear": 0.0781,
-      "Other Fossil": 0.012,
+      "Coal": 0.0071,
+      "Gas": 0.5103,
+      "Hydro": 0.2467,
+      "Nuclear": 0.077,
+      "Other Fossil": 0.0124,
       "Other Renewables": 0.0002,
-      "Solar": 0.0263,
-      "Wind": 0.112
+      "Solar": 0.0266,
+      "Wind": 0.1108
     }
   },
   "AS": {
@@ -590,7 +590,7 @@
     },
     "2023": {
       "Bioenergy": 0.0238,
-      "Coal": 0.0104,
+      "Coal": 0.0103,
       "Gas": 0.1183,
       "Hydro": 0.64,
       "Nuclear": 0.0127,
@@ -600,15 +600,15 @@
       "Wind": 0.1383
     },
     "2024": {
-      "Bioenergy": 0.0251,
+      "Bioenergy": 0.0259,
       "Coal": 0,
-      "Gas": 0.0492,
-      "Hydro": 0.6813,
+      "Gas": 0.0553,
+      "Hydro": 0.6751,
       "Nuclear": 0,
-      "Other Fossil": 0.0152,
+      "Other Fossil": 0.0154,
       "Other Renewables": 0,
-      "Solar": 0.0962,
-      "Wind": 0.133
+      "Solar": 0.0942,
+      "Wind": 0.1341
     }
   },
   "AU": {
@@ -669,14 +669,14 @@
     },
     "2024": {
       "Bioenergy": 0.0018,
-      "Coal": 0.5456,
-      "Gas": 0.0806,
-      "Hydro": 0.0566,
+      "Coal": 0.5441,
+      "Gas": 0.0804,
+      "Hydro": 0.057,
       "Nuclear": 0,
-      "Other Fossil": 0.0002,
+      "Other Fossil": 0.0003,
       "Other Renewables": 0,
-      "Solar": 0.1774,
-      "Wind": 0.1379
+      "Solar": 0.1817,
+      "Wind": 0.1348
     }
   },
   "AW": {
@@ -873,14 +873,14 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Coal": 0.6517,
+      "Coal": 0.66,
       "Gas": 0,
-      "Hydro": 0.3093,
+      "Hydro": 0.2993,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0265,
-      "Wind": 0.0125
+      "Solar": 0.0285,
+      "Wind": 0.0122
     }
   },
   "BB": {
@@ -987,7 +987,7 @@
     },
     "2022": {
       "Bioenergy": 0.0019,
-      "Coal": 0.1402,
+      "Coal": 0.1401,
       "Gas": 0.5194,
       "Hydro": 0.0209,
       "Nuclear": 0.0049,
@@ -1002,21 +1002,21 @@
       "Gas": 0.5054,
       "Hydro": 0.0269,
       "Nuclear": 0.009,
-      "Other Fossil": 0.1551,
+      "Other Fossil": 0.1552,
       "Other Renewables": 0.0008,
       "Solar": 0.0177,
       "Wind": 0.0117
     },
     "2024": {
       "Bioenergy": 0.0032,
-      "Coal": 0.3615,
-      "Gas": 0.447,
-      "Hydro": 0.0302,
+      "Coal": 0.3616,
+      "Gas": 0.4471,
+      "Hydro": 0.0295,
       "Nuclear": 0.0081,
       "Other Fossil": 0.1175,
       "Other Renewables": 0.0008,
       "Solar": 0.0212,
-      "Wind": 0.0105
+      "Wind": 0.0111
     }
   },
   "BE": {
@@ -1077,14 +1077,14 @@
     },
     "2024": {
       "Bioenergy": 0.0115,
-      "Coal": 0.0159,
-      "Gas": 0.1473,
-      "Hydro": 0.0245,
-      "Nuclear": 0.4026,
-      "Other Fossil": 0.0891,
+      "Coal": 0.0169,
+      "Gas": 0.1498,
+      "Hydro": 0.0257,
+      "Nuclear": 0.403,
+      "Other Fossil": 0.09,
       "Other Renewables": 0.0008,
-      "Solar": 0.1345,
-      "Wind": 0.1739
+      "Solar": 0.1298,
+      "Wind": 0.1725
     }
   },
   "BF": {
@@ -1213,14 +1213,14 @@
     },
     "2024": {
       "Bioenergy": 0.0041,
-      "Coal": 0.2386,
-      "Gas": 0.0586,
-      "Hydro": 0.0925,
-      "Nuclear": 0.4279,
+      "Coal": 0.2408,
+      "Gas": 0.0592,
+      "Hydro": 0.091,
+      "Nuclear": 0.4246,
       "Other Fossil": 0.0004,
       "Other Renewables": 0.0001,
-      "Solar": 0.1404,
-      "Wind": 0.0375
+      "Solar": 0.1423,
+      "Wind": 0.0374
     }
   },
   "BH": {
@@ -1688,15 +1688,15 @@
       "Wind": 0.1416
     },
     "2024": {
-      "Bioenergy": 0.0146,
-      "Coal": 0.0116,
-      "Gas": 0.0632,
-      "Hydro": 0.6223,
-      "Nuclear": 0.0247,
-      "Other Fossil": 0.011,
+      "Bioenergy": 0.0142,
+      "Coal": 0.0128,
+      "Gas": 0.0635,
+      "Hydro": 0.6206,
+      "Nuclear": 0.0246,
+      "Other Fossil": 0.0115,
       "Other Renewables": 0,
-      "Solar": 0.1017,
-      "Wind": 0.1509
+      "Solar": 0.1033,
+      "Wind": 0.1494
     }
   },
   "BS": {
@@ -2028,15 +2028,15 @@
       "Wind": 0.0381
     },
     "2024": {
-      "Bioenergy": 0.171,
+      "Bioenergy": 0.1711,
       "Coal": 0.0155,
-      "Gas": 0.106,
-      "Hydro": 0.5112,
-      "Nuclear": 0.0098,
-      "Other Fossil": 0.103,
-      "Other Renewables": 0.0025,
-      "Solar": 0.0406,
-      "Wind": 0.0404
+      "Gas": 0.1069,
+      "Hydro": 0.5096,
+      "Nuclear": 0.0095,
+      "Other Fossil": 0.1031,
+      "Other Renewables": 0.0024,
+      "Solar": 0.0412,
+      "Wind": 0.0406
     }
   },
   "CA": {
@@ -2096,15 +2096,15 @@
       "Wind": 0.0646
     },
     "2024": {
-      "Bioenergy": 0.0163,
-      "Coal": 0.0476,
-      "Gas": 0.1499,
-      "Hydro": 0.5638,
-      "Nuclear": 0.1338,
+      "Bioenergy": 0.0164,
+      "Coal": 0.048,
+      "Gas": 0.1511,
+      "Hydro": 0.5592,
+      "Nuclear": 0.1352,
       "Other Fossil": 0.0107,
       "Other Renewables": 0.0005,
-      "Solar": 0.0109,
-      "Wind": 0.0665
+      "Solar": 0.0104,
+      "Wind": 0.0685
     }
   },
   "CD": {
@@ -2371,11 +2371,11 @@
       "Bioenergy": 0,
       "Coal": 0.0002,
       "Gas": 0.0003,
-      "Hydro": 0.6069,
-      "Nuclear": 0.2827,
-      "Other Fossil": 0.0451,
+      "Hydro": 0.6128,
+      "Nuclear": 0.2791,
+      "Other Fossil": 0.0452,
       "Other Renewables": 0,
-      "Solar": 0.0633,
+      "Solar": 0.061,
       "Wind": 0.0015
     }
   },
@@ -2572,15 +2572,15 @@
       "Wind": 0.1187
     },
     "2024": {
-      "Bioenergy": 0.0237,
-      "Coal": 0.1599,
-      "Gas": 0.1621,
-      "Hydro": 0.2958,
+      "Bioenergy": 0.0235,
+      "Coal": 0.1577,
+      "Gas": 0.1599,
+      "Hydro": 0.3045,
       "Nuclear": 0,
-      "Other Fossil": 0.0141,
+      "Other Fossil": 0.0139,
       "Other Renewables": 0.0039,
-      "Solar": 0.2093,
-      "Wind": 0.1312
+      "Solar": 0.2089,
+      "Wind": 0.1276
     }
   },
   "CM": {
@@ -2660,7 +2660,7 @@
       "Nuclear": 0.0475,
       "Other Fossil": 0.0028,
       "Other Renewables": 0,
-      "Solar": 0.0306,
+      "Solar": 0.0305,
       "Wind": 0.0553
     },
     "2020": {
@@ -2671,7 +2671,7 @@
       "Nuclear": 0.0481,
       "Other Fossil": 0.0026,
       "Other Renewables": 0,
-      "Solar": 0.0342,
+      "Solar": 0.0343,
       "Wind": 0.0612
     },
     "2021": {
@@ -2700,7 +2700,7 @@
       "Bioenergy": 0.0204,
       "Coal": 0.6193,
       "Gas": 0.0299,
-      "Hydro": 0.1241,
+      "Hydro": 0.124,
       "Nuclear": 0.0466,
       "Other Fossil": 0.0018,
       "Other Renewables": 0,
@@ -2708,15 +2708,15 @@
       "Wind": 0.0952
     },
     "2024": {
-      "Bioenergy": 0.0194,
-      "Coal": 0.59,
-      "Gas": 0.0285,
-      "Hydro": 0.1365,
-      "Nuclear": 0.0437,
+      "Bioenergy": 0.0193,
+      "Coal": 0.5875,
+      "Gas": 0.0284,
+      "Hydro": 0.1358,
+      "Nuclear": 0.0442,
       "Other Fossil": 0.0017,
       "Other Renewables": 0,
-      "Solar": 0.0855,
-      "Wind": 0.0948
+      "Solar": 0.0861,
+      "Wind": 0.097
     }
   },
   "CO": {
@@ -2777,14 +2777,14 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Coal": 0.123,
-      "Gas": 0.0636,
-      "Hydro": 0.761,
+      "Coal": 0.1281,
+      "Gas": 0.0688,
+      "Hydro": 0.749,
       "Nuclear": 0,
-      "Other Fossil": 0.007,
+      "Other Fossil": 0.0074,
       "Other Renewables": 0,
-      "Solar": 0.0431,
-      "Wind": 0.0022
+      "Solar": 0.0443,
+      "Wind": 0.0023
     }
   },
   "CR": {
@@ -2844,15 +2844,15 @@
       "Wind": 0.1222
     },
     "2024": {
-      "Bioenergy": 0.0042,
-      "Coal": 0.0015,
-      "Gas": 0.0099,
-      "Hydro": 0.6297,
-      "Nuclear": 0.0009,
-      "Other Fossil": 0.1328,
-      "Other Renewables": 0.1214,
-      "Solar": 0.0028,
-      "Wind": 0.0969
+      "Bioenergy": 0.0041,
+      "Coal": 0.0011,
+      "Gas": 0.0077,
+      "Hydro": 0.6392,
+      "Nuclear": 0.0007,
+      "Other Fossil": 0.1265,
+      "Other Renewables": 0.12,
+      "Solar": 0.0023,
+      "Wind": 0.0985
     }
   },
   "CU": {
@@ -3053,10 +3053,10 @@
       "Gas": 0,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": 0.7685,
+      "Other Fossil": 0.765,
       "Other Renewables": 0,
-      "Solar": 0.1954,
-      "Wind": 0.0361
+      "Solar": 0.1983,
+      "Wind": 0.0367
     }
   },
   "CZ": {
@@ -3116,14 +3116,14 @@
       "Wind": 0.0105
     },
     "2024": {
-      "Bioenergy": 0.0329,
-      "Coal": 0.3255,
-      "Gas": 0.0436,
-      "Hydro": 0.0383,
-      "Nuclear": 0.4294,
+      "Bioenergy": 0.033,
+      "Coal": 0.3334,
+      "Gas": 0.0452,
+      "Hydro": 0.0381,
+      "Nuclear": 0.4225,
       "Other Fossil": 0.0139,
-      "Other Renewables": 0.0364,
-      "Solar": 0.0696,
+      "Other Renewables": 0.0365,
+      "Solar": 0.0671,
       "Wind": 0.0104
     }
   },
@@ -3184,15 +3184,15 @@
       "Wind": 0.2709
     },
     "2024": {
-      "Bioenergy": 0.0874,
-      "Coal": 0.1955,
-      "Gas": 0.1632,
-      "Hydro": 0.0604,
-      "Nuclear": 0.0123,
-      "Other Fossil": 0.0425,
+      "Bioenergy": 0.0877,
+      "Coal": 0.2007,
+      "Gas": 0.1655,
+      "Hydro": 0.061,
+      "Nuclear": 0.0127,
+      "Other Fossil": 0.0422,
       "Other Renewables": 0.0004,
-      "Solar": 0.1765,
-      "Wind": 0.2617
+      "Solar": 0.1686,
+      "Wind": 0.261
     }
   },
   "DJ": {
@@ -3310,7 +3310,7 @@
     },
     "2023": {
       "Bioenergy": 0.1058,
-      "Coal": 0.1053,
+      "Coal": 0.1052,
       "Gas": 0.0769,
       "Hydro": 0.0177,
       "Nuclear": 0.0198,
@@ -3320,15 +3320,15 @@
       "Wind": 0.5468
     },
     "2024": {
-      "Bioenergy": 0.0949,
-      "Coal": 0.0975,
-      "Gas": 0.07,
-      "Hydro": 0.0227,
-      "Nuclear": 0.0245,
-      "Other Fossil": 0.0337,
-      "Other Renewables": 0.0008,
-      "Solar": 0.1319,
-      "Wind": 0.524
+      "Bioenergy": 0.0962,
+      "Coal": 0.0983,
+      "Gas": 0.0684,
+      "Hydro": 0.0205,
+      "Nuclear": 0.0219,
+      "Other Fossil": 0.0338,
+      "Other Renewables": 0.0007,
+      "Solar": 0.1242,
+      "Wind": 0.536
     }
   },
   "DM": {
@@ -3592,15 +3592,15 @@
       "Wind": 0.0088
     },
     "2024": {
-      "Bioenergy": 0.0129,
-      "Coal": 0.0004,
-      "Gas": 0.0285,
-      "Hydro": 0.7235,
-      "Nuclear": 0.0002,
-      "Other Fossil": 0.2248,
+      "Bioenergy": 0.0132,
+      "Coal": 0.0006,
+      "Gas": 0.0319,
+      "Hydro": 0.702,
+      "Nuclear": 0.0004,
+      "Other Fossil": 0.2417,
       "Other Renewables": 0.0001,
-      "Solar": 0.0007,
-      "Wind": 0.009
+      "Solar": 0.0012,
+      "Wind": 0.0089
     }
   },
   "EE": {
@@ -3650,8 +3650,8 @@
     },
     "2023": {
       "Bioenergy": 0.0749,
-      "Coal": 0.0616,
-      "Gas": 0.0999,
+      "Coal": 0.0615,
+      "Gas": 0.1,
       "Hydro": 0.0706,
       "Nuclear": 0.0821,
       "Other Fossil": 0.3374,
@@ -3660,15 +3660,15 @@
       "Wind": 0.1555
     },
     "2024": {
-      "Bioenergy": 0.0625,
-      "Coal": 0.0474,
-      "Gas": 0.0807,
-      "Hydro": 0.0665,
-      "Nuclear": 0.0713,
-      "Other Fossil": 0.3212,
+      "Bioenergy": 0.0649,
+      "Coal": 0.0483,
+      "Gas": 0.0822,
+      "Hydro": 0.0677,
+      "Nuclear": 0.0728,
+      "Other Fossil": 0.3137,
       "Other Renewables": 0.0023,
-      "Solar": 0.1814,
-      "Wind": 0.1668
+      "Solar": 0.1714,
+      "Wind": 0.1767
     }
   },
   "EG": {
@@ -3864,15 +3864,15 @@
       "Wind": 0.249
     },
     "2024": {
-      "Bioenergy": 0.014,
+      "Bioenergy": 0.0139,
       "Coal": 0.0117,
-      "Gas": 0.1582,
-      "Hydro": 0.1286,
-      "Nuclear": 0.2211,
+      "Gas": 0.1576,
+      "Hydro": 0.1342,
+      "Nuclear": 0.2192,
       "Other Fossil": 0.0098,
       "Other Renewables": 0.0027,
-      "Solar": 0.2177,
-      "Wind": 0.2362
+      "Solar": 0.2092,
+      "Wind": 0.2416
     }
   },
   "ET": {
@@ -4000,15 +4000,15 @@
       "Wind": 0.1767
     },
     "2024": {
-      "Bioenergy": 0.1126,
-      "Coal": 0.0202,
-      "Gas": 0.0233,
-      "Hydro": 0.1893,
-      "Nuclear": 0.3775,
-      "Other Fossil": 0.0422,
-      "Other Renewables": 0.001,
-      "Solar": 0.0214,
-      "Wind": 0.2124
+      "Bioenergy": 0.1102,
+      "Coal": 0.0198,
+      "Gas": 0.0213,
+      "Hydro": 0.1898,
+      "Nuclear": 0.3787,
+      "Other Fossil": 0.0423,
+      "Other Renewables": 0.0009,
+      "Solar": 0.0193,
+      "Wind": 0.2176
     }
   },
   "FJ": {
@@ -4272,15 +4272,15 @@
       "Wind": 0.1023
     },
     "2024": {
-      "Bioenergy": 0.0062,
-      "Coal": 0.001,
-      "Gas": 0.03,
-      "Hydro": 0.1233,
-      "Nuclear": 0.6921,
-      "Other Fossil": 0.006,
+      "Bioenergy": 0.0061,
+      "Coal": 0.0008,
+      "Gas": 0.0297,
+      "Hydro": 0.1272,
+      "Nuclear": 0.6924,
+      "Other Fossil": 0.0062,
       "Other Renewables": 0,
-      "Solar": 0.0514,
-      "Wind": 0.0901
+      "Solar": 0.0498,
+      "Wind": 0.0878
     }
   },
   "GA": {
@@ -4398,8 +4398,8 @@
     },
     "2023": {
       "Bioenergy": 0.0538,
-      "Coal": 0.0238,
-      "Gas": 0.3528,
+      "Coal": 0.0237,
+      "Gas": 0.3529,
       "Hydro": 0.028,
       "Nuclear": 0.1644,
       "Other Fossil": 0.0116,
@@ -4408,15 +4408,15 @@
       "Wind": 0.3128
     },
     "2024": {
-      "Bioenergy": 0.0761,
-      "Coal": 0.0252,
-      "Gas": 0.2839,
-      "Hydro": 0.0393,
-      "Nuclear": 0.1797,
-      "Other Fossil": 0.0148,
+      "Bioenergy": 0.0758,
+      "Coal": 0.0246,
+      "Gas": 0.2876,
+      "Hydro": 0.0388,
+      "Nuclear": 0.1762,
+      "Other Fossil": 0.0149,
       "Other Renewables": 0.0009,
-      "Solar": 0.0724,
-      "Wind": 0.3076
+      "Solar": 0.0698,
+      "Wind": 0.3115
     }
   },
   "GD": {
@@ -4494,14 +4494,14 @@
       "Gas": 0.2287,
       "Hydro": 0.6719,
       "Nuclear": 0.0065,
-      "Other Fossil": 0.0012,
+      "Other Fossil": 0.0013,
       "Other Renewables": 0.0007,
       "Solar": 0.0035,
       "Wind": 0.0138
     },
     "2020": {
       "Bioenergy": 0.002,
-      "Coal": 0.0663,
+      "Coal": 0.0662,
       "Gas": 0.2405,
       "Hydro": 0.6652,
       "Nuclear": 0.0059,
@@ -4514,9 +4514,9 @@
       "Bioenergy": 0.0028,
       "Coal": 0.0825,
       "Gas": 0.1829,
-      "Hydro": 0.7006,
+      "Hydro": 0.7005,
       "Nuclear": 0.0072,
-      "Other Fossil": 0.0013,
+      "Other Fossil": 0.0014,
       "Other Renewables": 0.0007,
       "Solar": 0.0055,
       "Wind": 0.0166
@@ -4534,7 +4534,7 @@
     },
     "2023": {
       "Bioenergy": 0.0013,
-      "Coal": 0.034,
+      "Coal": 0.0339,
       "Gas": 0.249,
       "Hydro": 0.6962,
       "Nuclear": 0.0032,
@@ -4547,12 +4547,12 @@
       "Bioenergy": 0.0009,
       "Coal": 0.0232,
       "Gas": 0.1839,
-      "Hydro": 0.7761,
+      "Hydro": 0.776,
       "Nuclear": 0.0021,
       "Other Fossil": 0.0003,
       "Other Renewables": 0.0002,
       "Solar": 0.0027,
-      "Wind": 0.0107
+      "Wind": 0.0108
     }
   },
   "GF": {
@@ -5156,15 +5156,15 @@
       "Wind": 0.2195
     },
     "2024": {
-      "Bioenergy": 0.0011,
-      "Coal": 0.0649,
-      "Gas": 0.415,
-      "Hydro": 0.0655,
-      "Nuclear": 0.0078,
-      "Other Fossil": 0.0008,
+      "Bioenergy": 0.0009,
+      "Coal": 0.0622,
+      "Gas": 0.4101,
+      "Hydro": 0.0628,
+      "Nuclear": 0.0063,
+      "Other Fossil": 0.0006,
       "Other Renewables": 0.0002,
-      "Solar": 0.2422,
-      "Wind": 0.2025
+      "Solar": 0.242,
+      "Wind": 0.2149
     }
   },
   "GT": {
@@ -5442,7 +5442,7 @@
   "HK": {
     "2019": {
       "Bioenergy": 0.0066,
-      "Coal": 0.5738,
+      "Coal": 0.5737,
       "Gas": 0.3455,
       "Hydro": 0.0347,
       "Nuclear": 0.0134,
@@ -5470,7 +5470,7 @@
       "Nuclear": 0.0134,
       "Other Fossil": 0.0061,
       "Other Renewables": 0.0012,
-      "Solar": 0.0108,
+      "Solar": 0.0109,
       "Wind": 0.0143
     },
     "2022": {
@@ -5481,7 +5481,7 @@
       "Nuclear": 0.0134,
       "Other Fossil": 0.0062,
       "Other Renewables": 0.0012,
-      "Solar": 0.0131,
+      "Solar": 0.0132,
       "Wind": 0.0159
     },
     "2023": {
@@ -5497,14 +5497,14 @@
     },
     "2024": {
       "Bioenergy": 0.0079,
-      "Coal": 0.564,
-      "Gas": 0.3396,
-      "Hydro": 0.0326,
+      "Coal": 0.5641,
+      "Gas": 0.3397,
+      "Hydro": 0.0316,
       "Nuclear": 0.0129,
       "Other Fossil": 0.0052,
       "Other Renewables": 0.0012,
-      "Solar": 0.0199,
-      "Wind": 0.0167
+      "Solar": 0.0198,
+      "Wind": 0.0177
     }
   },
   "HN": {
@@ -5566,7 +5566,7 @@
     "2024": {
       "Bioenergy": 0.1288,
       "Coal": 0.0008,
-      "Gas": 0.0055,
+      "Gas": 0.0056,
       "Hydro": 0.2239,
       "Nuclear": 0.0005,
       "Other Fossil": 0.4392,
@@ -5613,7 +5613,7 @@
       "Bioenergy": 0.045,
       "Coal": 0.1289,
       "Gas": 0.2553,
-      "Hydro": 0.2986,
+      "Hydro": 0.2987,
       "Nuclear": 0.0576,
       "Other Fossil": 0.0073,
       "Other Renewables": 0.0245,
@@ -5622,7 +5622,7 @@
     },
     "2023": {
       "Bioenergy": 0.0384,
-      "Coal": 0.0897,
+      "Coal": 0.0896,
       "Gas": 0.2278,
       "Hydro": 0.4126,
       "Nuclear": 0.0297,
@@ -5632,15 +5632,15 @@
       "Wind": 0.1603
     },
     "2024": {
-      "Bioenergy": 0.0415,
-      "Coal": 0.0654,
-      "Gas": 0.2285,
-      "Hydro": 0.3568,
-      "Nuclear": 0.0616,
-      "Other Fossil": 0.0101,
-      "Other Renewables": 0.0154,
-      "Solar": 0.0445,
-      "Wind": 0.1762
+      "Bioenergy": 0.042,
+      "Coal": 0.0674,
+      "Gas": 0.224,
+      "Hydro": 0.3705,
+      "Nuclear": 0.0582,
+      "Other Fossil": 0.0098,
+      "Other Renewables": 0.0161,
+      "Solar": 0.0421,
+      "Wind": 0.1698
     }
   },
   "HT": {
@@ -5758,24 +5758,24 @@
     },
     "2023": {
       "Bioenergy": 0.024,
-      "Coal": 0.0987,
+      "Coal": 0.0986,
       "Gas": 0.2082,
       "Hydro": 0.0476,
       "Nuclear": 0.3885,
       "Other Fossil": 0.0192,
       "Other Renewables": 0.0027,
-      "Solar": 0.164,
+      "Solar": 0.1641,
       "Wind": 0.0471
     },
     "2024": {
-      "Bioenergy": 0.0239,
-      "Coal": 0.086,
-      "Gas": 0.1697,
-      "Hydro": 0.0457,
-      "Nuclear": 0.3584,
-      "Other Fossil": 0.0171,
+      "Bioenergy": 0.0241,
+      "Coal": 0.0858,
+      "Gas": 0.1726,
+      "Hydro": 0.046,
+      "Nuclear": 0.3623,
+      "Other Fossil": 0.0173,
       "Other Renewables": 0.0038,
-      "Solar": 0.2524,
+      "Solar": 0.2451,
       "Wind": 0.043
     }
   },
@@ -5797,7 +5797,7 @@
       "Gas": 0.2104,
       "Hydro": 0.072,
       "Nuclear": 0.0003,
-      "Other Fossil": 0.0356,
+      "Other Fossil": 0.0357,
       "Other Renewables": 0.0476,
       "Solar": 0.0006,
       "Wind": 0.0018
@@ -5822,7 +5822,7 @@
       "Other Fossil": 0.0357,
       "Other Renewables": 0.0476,
       "Solar": 0.0007,
-      "Wind": 0.0019
+      "Wind": 0.002
     },
     "2023": {
       "Bioenergy": 0.0411,
@@ -5904,15 +5904,15 @@
       "Wind": 0.3594
     },
     "2024": {
-      "Bioenergy": 0.0084,
-      "Coal": 0.0503,
-      "Gas": 0.4242,
-      "Hydro": 0.0534,
-      "Nuclear": 0.0343,
-      "Other Fossil": 0.0365,
+      "Bioenergy": 0.0082,
+      "Coal": 0.0511,
+      "Gas": 0.4383,
+      "Hydro": 0.0519,
+      "Nuclear": 0.0332,
+      "Other Fossil": 0.0393,
       "Other Renewables": 0.0011,
-      "Solar": 0.0415,
-      "Wind": 0.3503
+      "Solar": 0.0384,
+      "Wind": 0.3385
     }
   },
   "IL": {
@@ -6041,14 +6041,14 @@
     },
     "2024": {
       "Bioenergy": 0.0064,
-      "Coal": 0.7227,
-      "Gas": 0.0202,
-      "Hydro": 0.0953,
-      "Nuclear": 0.03,
-      "Other Fossil": 0.0003,
-      "Other Renewables": 0.0016,
-      "Solar": 0.0707,
-      "Wind": 0.0529
+      "Coal": 0.7238,
+      "Gas": 0.0203,
+      "Hydro": 0.0945,
+      "Nuclear": 0.0294,
+      "Other Fossil": 0.0002,
+      "Other Renewables": 0.0015,
+      "Solar": 0.0725,
+      "Wind": 0.0513
     }
   },
   "IQ": {
@@ -6302,7 +6302,7 @@
     },
     "2023": {
       "Bioenergy": 0.0561,
-      "Coal": 0.067,
+      "Coal": 0.0669,
       "Gas": 0.4228,
       "Hydro": 0.1518,
       "Nuclear": 0.0345,
@@ -6312,15 +6312,15 @@
       "Wind": 0.1016
     },
     "2024": {
-      "Bioenergy": 0.0557,
-      "Coal": 0.034,
-      "Gas": 0.3934,
-      "Hydro": 0.1921,
-      "Nuclear": 0.0339,
+      "Bioenergy": 0.056,
+      "Coal": 0.0346,
+      "Gas": 0.3905,
+      "Hydro": 0.1978,
+      "Nuclear": 0.0345,
       "Other Fossil": 0.0329,
-      "Other Renewables": 0.0187,
-      "Solar": 0.1458,
-      "Wind": 0.0936
+      "Other Renewables": 0.0188,
+      "Solar": 0.1418,
+      "Wind": 0.0932
     }
   },
   "JM": {
@@ -6516,15 +6516,15 @@
       "Wind": 0.0183
     },
     "2024": {
-      "Bioenergy": 0.0588,
-      "Coal": 0.2533,
-      "Gas": 0.2967,
-      "Hydro": 0.0912,
-      "Nuclear": 0.0966,
-      "Other Fossil": 0.0332,
-      "Other Renewables": 0.0112,
-      "Solar": 0.1405,
-      "Wind": 0.0185
+      "Bioenergy": 0.0561,
+      "Coal": 0.277,
+      "Gas": 0.3058,
+      "Hydro": 0.0902,
+      "Nuclear": 0.0864,
+      "Other Fossil": 0.0338,
+      "Other Renewables": 0.0099,
+      "Solar": 0.1231,
+      "Wind": 0.0176
     }
   },
   "KE": {
@@ -6585,14 +6585,14 @@
     },
     "2024": {
       "Bioenergy": 0.0099,
-      "Coal": 0.0323,
-      "Gas": 0.0439,
-      "Hydro": 0.2871,
+      "Coal": 0.032,
+      "Gas": 0.0434,
+      "Hydro": 0.2801,
       "Nuclear": 0.0016,
-      "Other Fossil": 0.0726,
-      "Other Renewables": 0.3939,
-      "Solar": 0.0322,
-      "Wind": 0.1266
+      "Other Fossil": 0.0729,
+      "Other Renewables": 0.3932,
+      "Solar": 0.0342,
+      "Wind": 0.1326
     }
   },
   "KG": {
@@ -6667,7 +6667,7 @@
     "2019": {
       "Bioenergy": 0.0123,
       "Coal": 0.481,
-      "Gas": 0.0312,
+      "Gas": 0.0311,
       "Hydro": 0.3745,
       "Nuclear": 0.0137,
       "Other Fossil": 0.0573,
@@ -6690,9 +6690,9 @@
       "Bioenergy": 0.0133,
       "Coal": 0.478,
       "Gas": 0.0286,
-      "Hydro": 0.3725,
+      "Hydro": 0.3724,
       "Nuclear": 0.0138,
-      "Other Fossil": 0.0571,
+      "Other Fossil": 0.0572,
       "Other Renewables": 0.0012,
       "Solar": 0.0208,
       "Wind": 0.0147
@@ -6716,19 +6716,19 @@
       "Nuclear": 0.0138,
       "Other Fossil": 0.0565,
       "Other Renewables": 0.0013,
-      "Solar": 0.0258,
+      "Solar": 0.0259,
       "Wind": 0.0181
     },
     "2024": {
       "Bioenergy": 0.0136,
-      "Coal": 0.471,
-      "Gas": 0.0251,
-      "Hydro": 0.3724,
+      "Coal": 0.4711,
+      "Gas": 0.0252,
+      "Hydro": 0.3713,
       "Nuclear": 0.0132,
       "Other Fossil": 0.0562,
       "Other Renewables": 0.0012,
-      "Solar": 0.0302,
-      "Wind": 0.0171
+      "Solar": 0.03,
+      "Wind": 0.0182
     }
   },
   "KI": {
@@ -7060,15 +7060,15 @@
       "Wind": 0.0058
     },
     "2024": {
-      "Bioenergy": 0.0208,
-      "Coal": 0.2985,
-      "Gas": 0.2879,
-      "Hydro": 0.0081,
-      "Nuclear": 0.3004,
-      "Other Fossil": 0.0076,
-      "Other Renewables": 0.0131,
-      "Solar": 0.059,
-      "Wind": 0.0048
+      "Bioenergy": 0.021,
+      "Coal": 0.2912,
+      "Gas": 0.2839,
+      "Hydro": 0.008,
+      "Nuclear": 0.3114,
+      "Other Fossil": 0.0077,
+      "Other Renewables": 0.0135,
+      "Solar": 0.0583,
+      "Wind": 0.005
     }
   },
   "KW": {
@@ -7130,10 +7130,10 @@
     "2024": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.5835,
+      "Gas": 0.5833,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": 0.4165,
+      "Other Fossil": 0.4167,
       "Other Renewables": 0,
       "Solar": 0,
       "Wind": 0
@@ -7265,14 +7265,14 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Coal": 0.5477,
+      "Coal": 0.5472,
       "Gas": 0.2762,
-      "Hydro": 0.1008,
+      "Hydro": 0.0997,
       "Nuclear": 0,
-      "Other Fossil": 0.0203,
+      "Other Fossil": 0.0204,
       "Other Renewables": 0,
-      "Solar": 0.0198,
-      "Wind": 0.0351
+      "Solar": 0.0192,
+      "Wind": 0.0372
     }
   },
   "LA": {
@@ -7481,70 +7481,70 @@
   },
   "LK": {
     "2019": {
-      "Bioenergy": 0.0069,
-      "Coal": 0.3354,
+      "Bioenergy": 0,
+      "Coal": 0.3403,
       "Gas": 0,
-      "Hydro": 0.3004,
+      "Hydro": 0.2406,
       "Nuclear": 0,
-      "Other Fossil": 0.316,
+      "Other Fossil": 0.3187,
       "Other Renewables": 0,
-      "Solar": 0.0194,
-      "Wind": 0.0219
+      "Solar": 0.0534,
+      "Wind": 0.047
     },
     "2020": {
-      "Bioenergy": 0.0069,
-      "Coal": 0.3354,
+      "Bioenergy": 0.0127,
+      "Coal": 0.3672,
       "Gas": 0,
-      "Hydro": 0.3004,
+      "Hydro": 0.2497,
       "Nuclear": 0,
-      "Other Fossil": 0.316,
+      "Other Fossil": 0.2662,
       "Other Renewables": 0,
-      "Solar": 0.0194,
-      "Wind": 0.0219
+      "Solar": 0.0559,
+      "Wind": 0.0483
     },
     "2021": {
-      "Bioenergy": 0.0069,
-      "Coal": 0.3354,
+      "Bioenergy": 0.0227,
+      "Coal": 0.3293,
       "Gas": 0,
-      "Hydro": 0.3004,
+      "Hydro": 0.3371,
       "Nuclear": 0,
-      "Other Fossil": 0.316,
+      "Other Fossil": 0.1584,
       "Other Renewables": 0,
-      "Solar": 0.0194,
-      "Wind": 0.0219
+      "Solar": 0.0687,
+      "Wind": 0.0837
     },
     "2022": {
-      "Bioenergy": 0.0069,
-      "Coal": 0.3354,
+      "Bioenergy": 0.0126,
+      "Coal": 0.3266,
       "Gas": 0,
-      "Hydro": 0.3004,
+      "Hydro": 0.3342,
       "Nuclear": 0,
-      "Other Fossil": 0.316,
+      "Other Fossil": 0.1567,
       "Other Renewables": 0,
-      "Solar": 0.0194,
-      "Wind": 0.0219
+      "Solar": 0.0837,
+      "Wind": 0.0862
     },
     "2023": {
-      "Bioenergy": 0.0069,
-      "Coal": 0.3354,
+      "Bioenergy": 0.0134,
+      "Coal": 0.2992,
       "Gas": 0,
-      "Hydro": 0.3004,
+      "Hydro": 0.2947,
       "Nuclear": 0,
-      "Other Fossil": 0.316,
+      "Other Fossil": 0.2005,
       "Other Renewables": 0,
-      "Solar": 0.0194,
-      "Wind": 0.0219
+      "Solar": 0.0948,
+      "Wind": 0.0974
     },
     "2024": {
-      "Bioenergy": 0.0069,
-      "Coal": 0.3354,
+      "Bioenergy": 0.0169,
+      "Coal": 0.3553,
       "Gas": 0,
-      "Hydro": 0.3004,
+      "Hydro": 0.3223,
       "Nuclear": 0,
-      "Other Fossil": 0.316,
+      "Other Fossil": 0.1087,
       "Other Renewables": 0,
-      "Solar": 0.0194,
-      "Wind": 0.0219
+      "Solar": 0.0954,
+      "Wind": 0.1013
     }
   },
   "LR": {
@@ -7721,7 +7721,7 @@
       "Bioenergy": 0.0517,
       "Coal": 0.1208,
       "Gas": 0.2263,
-      "Hydro": 0.1433,
+      "Hydro": 0.1434,
       "Nuclear": 0.1414,
       "Other Fossil": 0.0467,
       "Other Renewables": 0.0047,
@@ -7730,10 +7730,10 @@
     },
     "2023": {
       "Bioenergy": 0.0386,
-      "Coal": 0.0896,
+      "Coal": 0.0894,
       "Gas": 0.1958,
       "Hydro": 0.1353,
-      "Nuclear": 0.1196,
+      "Nuclear": 0.1197,
       "Other Fossil": 0.0573,
       "Other Renewables": 0.0039,
       "Solar": 0.0882,
@@ -7741,14 +7741,14 @@
     },
     "2024": {
       "Bioenergy": 0.032,
-      "Coal": 0.0596,
-      "Gas": 0.1569,
-      "Hydro": 0.1167,
-      "Nuclear": 0.0909,
-      "Other Fossil": 0.0788,
-      "Other Renewables": 0.0029,
-      "Solar": 0.1732,
-      "Wind": 0.2891
+      "Coal": 0.0603,
+      "Gas": 0.1586,
+      "Hydro": 0.1174,
+      "Nuclear": 0.0918,
+      "Other Fossil": 0.0803,
+      "Other Renewables": 0.003,
+      "Solar": 0.1636,
+      "Wind": 0.2931
     }
   },
   "LU": {
@@ -7787,9 +7787,9 @@
     },
     "2022": {
       "Bioenergy": 0.0845,
-      "Coal": 0.1284,
+      "Coal": 0.1283,
       "Gas": 0.2272,
-      "Hydro": 0.1307,
+      "Hydro": 0.1308,
       "Nuclear": 0.1503,
       "Other Fossil": 0.0378,
       "Other Renewables": 0.005,
@@ -7798,8 +7798,8 @@
     },
     "2023": {
       "Bioenergy": 0.0551,
-      "Coal": 0.1116,
-      "Gas": 0.199,
+      "Coal": 0.1114,
+      "Gas": 0.1991,
       "Hydro": 0.1447,
       "Nuclear": 0.1499,
       "Other Fossil": 0.0364,
@@ -7808,15 +7808,15 @@
       "Wind": 0.2006
     },
     "2024": {
-      "Bioenergy": 0.0703,
-      "Coal": 0.0937,
-      "Gas": 0.1693,
-      "Hydro": 0.1607,
-      "Nuclear": 0.1438,
-      "Other Fossil": 0.039,
-      "Other Renewables": 0.0046,
-      "Solar": 0.1366,
-      "Wind": 0.1819
+      "Bioenergy": 0.0724,
+      "Coal": 0.0944,
+      "Gas": 0.1727,
+      "Hydro": 0.1615,
+      "Nuclear": 0.1447,
+      "Other Fossil": 0.0389,
+      "Other Renewables": 0.0047,
+      "Solar": 0.1313,
+      "Wind": 0.1795
     }
   },
   "LV": {
@@ -7866,7 +7866,7 @@
     },
     "2023": {
       "Bioenergy": 0.0374,
-      "Coal": 0.0399,
+      "Coal": 0.0398,
       "Gas": 0.2535,
       "Hydro": 0.4973,
       "Nuclear": 0.0576,
@@ -7877,14 +7877,14 @@
     },
     "2024": {
       "Bioenergy": 0.0469,
-      "Coal": 0.0304,
-      "Gas": 0.2685,
-      "Hydro": 0.4651,
-      "Nuclear": 0.0482,
-      "Other Fossil": 0.0139,
-      "Other Renewables": 0.0015,
-      "Solar": 0.0751,
-      "Wind": 0.0505
+      "Coal": 0.0339,
+      "Gas": 0.256,
+      "Hydro": 0.4646,
+      "Nuclear": 0.0532,
+      "Other Fossil": 0.0142,
+      "Other Renewables": 0.0017,
+      "Solar": 0.0742,
+      "Wind": 0.0553
     }
   },
   "LY": {
@@ -8012,15 +8012,15 @@
       "Wind": 0.1598
     },
     "2024": {
-      "Bioenergy": 0.0001,
-      "Coal": 0.6537,
-      "Gas": 0.1028,
-      "Hydro": 0.0169,
-      "Nuclear": 0.0005,
-      "Other Fossil": 0.0229,
-      "Other Renewables": 0.0002,
-      "Solar": 0.0456,
-      "Wind": 0.1573
+      "Bioenergy": 0.0003,
+      "Coal": 0.6056,
+      "Gas": 0.0949,
+      "Hydro": 0.0271,
+      "Nuclear": 0.001,
+      "Other Fossil": 0.0195,
+      "Other Renewables": 0.0004,
+      "Solar": 0.0445,
+      "Wind": 0.2066
     }
   },
   "MD": {
@@ -8070,7 +8070,7 @@
     },
     "2023": {
       "Bioenergy": 0.0008,
-      "Coal": 0.0046,
+      "Coal": 0.0045,
       "Gas": 0.9148,
       "Hydro": 0.0628,
       "Nuclear": 0.0058,
@@ -8148,15 +8148,15 @@
       "Wind": 0.0889
     },
     "2024": {
-      "Bioenergy": 0.0047,
-      "Coal": 0.3911,
-      "Gas": 0.0366,
-      "Hydro": 0.3863,
-      "Nuclear": 0.0347,
-      "Other Fossil": 0.0034,
-      "Other Renewables": 0.0011,
-      "Solar": 0.0455,
-      "Wind": 0.0966
+      "Bioenergy": 0.0042,
+      "Coal": 0.377,
+      "Gas": 0.0329,
+      "Hydro": 0.4153,
+      "Nuclear": 0.0313,
+      "Other Fossil": 0.0031,
+      "Other Renewables": 0.001,
+      "Solar": 0.0429,
+      "Wind": 0.0922
     }
   },
   "MG": {
@@ -8284,15 +8284,15 @@
       "Wind": 0.0292
     },
     "2024": {
-      "Bioenergy": 0.0166,
-      "Coal": 0.3773,
-      "Gas": 0.2243,
-      "Hydro": 0.2806,
-      "Nuclear": 0.0066,
-      "Other Fossil": 0.0006,
+      "Bioenergy": 0.0167,
+      "Coal": 0.393,
+      "Gas": 0.231,
+      "Hydro": 0.2676,
+      "Nuclear": 0.0067,
+      "Other Fossil": 0.0007,
       "Other Renewables": 0.0002,
-      "Solar": 0.0552,
-      "Wind": 0.0385
+      "Solar": 0.0503,
+      "Wind": 0.0337
     }
   },
   "ML": {
@@ -8489,27 +8489,27 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Coal": 0.9064,
+      "Coal": 0.9067,
       "Gas": 0,
       "Hydro": 0,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
       "Solar": 0,
-      "Wind": 0.0936
+      "Wind": 0.0933
     }
   },
   "MO": {
     "2019": {
       "Bioenergy": 0.0507,
-      "Coal": 0.5003,
+      "Coal": 0.5002,
       "Gas": 0.1809,
       "Hydro": 0.1182,
       "Nuclear": 0.0457,
-      "Other Fossil": 0.038,
+      "Other Fossil": 0.0381,
       "Other Renewables": 0.0048,
       "Solar": 0.0262,
-      "Wind": 0.0351
+      "Wind": 0.0352
     },
     "2020": {
       "Bioenergy": 0.0523,
@@ -8517,17 +8517,17 @@
       "Gas": 0.1781,
       "Hydro": 0.1206,
       "Nuclear": 0.0457,
-      "Other Fossil": 0.0371,
+      "Other Fossil": 0.0372,
       "Other Renewables": 0.0041,
       "Solar": 0.031,
       "Wind": 0.0389
     },
     "2021": {
-      "Bioenergy": 0.054,
+      "Bioenergy": 0.0541,
       "Coal": 0.4901,
       "Gas": 0.1725,
-      "Hydro": 0.1115,
-      "Nuclear": 0.0458,
+      "Hydro": 0.1114,
+      "Nuclear": 0.0457,
       "Other Fossil": 0.0375,
       "Other Renewables": 0.0041,
       "Solar": 0.0357,
@@ -8535,36 +8535,36 @@
     },
     "2022": {
       "Bioenergy": 0.0556,
-      "Coal": 0.4804,
+      "Coal": 0.4803,
       "Gas": 0.1679,
-      "Hydro": 0.1108,
+      "Hydro": 0.1109,
       "Nuclear": 0.0456,
       "Other Fossil": 0.0377,
       "Other Renewables": 0.0042,
-      "Solar": 0.0435,
+      "Solar": 0.0436,
       "Wind": 0.0543
     },
     "2023": {
       "Bioenergy": 0.0559,
-      "Coal": 0.4842,
-      "Gas": 0.1635,
+      "Coal": 0.4841,
+      "Gas": 0.1636,
       "Hydro": 0.0985,
       "Nuclear": 0.0458,
-      "Other Fossil": 0.0354,
+      "Other Fossil": 0.0355,
       "Other Renewables": 0.0042,
       "Solar": 0.0524,
       "Wind": 0.0601
     },
     "2024": {
       "Bioenergy": 0.055,
-      "Coal": 0.4671,
-      "Gas": 0.1607,
-      "Hydro": 0.1111,
+      "Coal": 0.4673,
+      "Gas": 0.161,
+      "Hydro": 0.1076,
       "Nuclear": 0.044,
       "Other Fossil": 0.0343,
-      "Other Renewables": 0.0041,
-      "Solar": 0.0667,
-      "Wind": 0.057
+      "Other Renewables": 0.0042,
+      "Solar": 0.0662,
+      "Wind": 0.0604
     }
   },
   "MQ": {
@@ -8818,25 +8818,25 @@
     },
     "2023": {
       "Bioenergy": 0.0043,
-      "Coal": 0.0229,
+      "Coal": 0.0228,
       "Gas": 0.7656,
       "Hydro": 0.0266,
-      "Nuclear": 0.0309,
+      "Nuclear": 0.031,
       "Other Fossil": 0.0079,
       "Other Renewables": 0.001,
       "Solar": 0.1208,
       "Wind": 0.02
     },
     "2024": {
-      "Bioenergy": 0.0064,
-      "Coal": 0.0296,
-      "Gas": 0.6967,
-      "Hydro": 0.0423,
-      "Nuclear": 0.0459,
-      "Other Fossil": 0.0071,
+      "Bioenergy": 0.0066,
+      "Coal": 0.0307,
+      "Gas": 0.687,
+      "Hydro": 0.0439,
+      "Nuclear": 0.0475,
+      "Other Fossil": 0.0073,
       "Other Renewables": 0.0015,
-      "Solar": 0.1435,
-      "Wind": 0.0272
+      "Solar": 0.1471,
+      "Wind": 0.0283
     }
   },
   "MU": {
@@ -9101,14 +9101,14 @@
     },
     "2024": {
       "Bioenergy": 0.0002,
-      "Coal": 0.0598,
-      "Gas": 0.6244,
-      "Hydro": 0.0574,
-      "Nuclear": 0.0302,
-      "Other Fossil": 0.1095,
-      "Other Renewables": 0.0103,
-      "Solar": 0.0525,
-      "Wind": 0.0558
+      "Coal": 0.0563,
+      "Gas": 0.6208,
+      "Hydro": 0.064,
+      "Nuclear": 0.0317,
+      "Other Fossil": 0.1074,
+      "Other Renewables": 0.0099,
+      "Solar": 0.0541,
+      "Wind": 0.0557
     }
   },
   "MY": {
@@ -9510,8 +9510,8 @@
     "2024": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.7588,
-      "Hydro": 0.2412,
+      "Gas": 0.7563,
+      "Hydro": 0.2437,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
@@ -9576,15 +9576,15 @@
       "Wind": 0.1535
     },
     "2024": {
-      "Bioenergy": 0.1685,
-      "Coal": 0.0032,
-      "Gas": 0.0216,
-      "Hydro": 0.0843,
-      "Nuclear": 0.002,
+      "Bioenergy": 0.1686,
+      "Coal": 0.0031,
+      "Gas": 0.0217,
+      "Hydro": 0.084,
+      "Nuclear": 0.0019,
       "Other Fossil": 0.3983,
       "Other Renewables": 0.1562,
-      "Solar": 0.012,
-      "Wind": 0.1539
+      "Solar": 0.0121,
+      "Wind": 0.154
     }
   },
   "NL": {
@@ -9644,15 +9644,15 @@
       "Wind": 0.2525
     },
     "2024": {
-      "Bioenergy": 0.0432,
-      "Coal": 0.0676,
-      "Gas": 0.3439,
-      "Hydro": 0.0019,
-      "Nuclear": 0.028,
-      "Other Fossil": 0.01,
+      "Bioenergy": 0.0475,
+      "Coal": 0.072,
+      "Gas": 0.3476,
+      "Hydro": 0.002,
+      "Nuclear": 0.0288,
+      "Other Fossil": 0.0101,
       "Other Renewables": 0.0049,
-      "Solar": 0.2382,
-      "Wind": 0.2622
+      "Solar": 0.2276,
+      "Wind": 0.2595
     }
   },
   "NO": {
@@ -9715,22 +9715,22 @@
       "Bioenergy": 0,
       "Coal": 0,
       "Gas": 0.0111,
-      "Hydro": 0.8933,
+      "Hydro": 0.8908,
       "Nuclear": 0,
-      "Other Fossil": 0.0019,
-      "Other Renewables": 0.0027,
+      "Other Fossil": 0.0018,
+      "Other Renewables": 0.0026,
       "Solar": 0,
-      "Wind": 0.091
+      "Wind": 0.0935
     }
   },
   "NP": {
     "2019": {
       "Bioenergy": 0.0032,
-      "Coal": 0.1221,
+      "Coal": 0.122,
       "Gas": 0.0253,
       "Hydro": 0.8098,
       "Nuclear": 0.0112,
-      "Other Fossil": 0.0021,
+      "Other Fossil": 0.0022,
       "Other Renewables": 0.0012,
       "Solar": 0.0154,
       "Wind": 0.0098
@@ -9765,7 +9765,7 @@
       "Nuclear": 0.0111,
       "Other Fossil": 0.0021,
       "Other Renewables": 0.001,
-      "Solar": 0.0196,
+      "Solar": 0.0197,
       "Wind": 0.0145
     },
     "2023": {
@@ -9782,13 +9782,13 @@
     "2024": {
       "Bioenergy": 0.0042,
       "Coal": 0.114,
-      "Gas": 0.0203,
-      "Hydro": 0.8081,
+      "Gas": 0.0204,
+      "Hydro": 0.8072,
       "Nuclear": 0.0107,
       "Other Fossil": 0.0012,
       "Other Renewables": 0.001,
-      "Solar": 0.0253,
-      "Wind": 0.0152
+      "Solar": 0.0252,
+      "Wind": 0.016
     }
   },
   "NR": {
@@ -9985,14 +9985,14 @@
     },
     "2024": {
       "Bioenergy": 0.0055,
-      "Coal": 0.0549,
-      "Gas": 0.1137,
-      "Hydro": 0.5338,
+      "Coal": 0.0529,
+      "Gas": 0.115,
+      "Hydro": 0.5391,
       "Nuclear": 0,
       "Other Fossil": 0.0006,
-      "Other Renewables": 0.2018,
+      "Other Renewables": 0.1985,
       "Solar": 0,
-      "Wind": 0.0898
+      "Wind": 0.0884
     }
   },
   "OM": {
@@ -10190,13 +10190,13 @@
     "2024": {
       "Bioenergy": 0.006,
       "Coal": 0,
-      "Gas": 0.3978,
-      "Hydro": 0.5042,
+      "Gas": 0.3977,
+      "Hydro": 0.5047,
       "Nuclear": 0,
       "Other Fossil": 0.0066,
       "Other Renewables": 0,
-      "Solar": 0.0197,
-      "Wind": 0.0655
+      "Solar": 0.0201,
+      "Wind": 0.0648
     }
   },
   "PF": {
@@ -10460,15 +10460,15 @@
       "Wind": 0.0338
     },
     "2024": {
-      "Bioenergy": 0.006,
-      "Coal": 0.1543,
-      "Gas": 0.2775,
-      "Hydro": 0.3299,
-      "Nuclear": 0.1819,
-      "Other Fossil": 0.0116,
+      "Bioenergy": 0.0059,
+      "Coal": 0.1639,
+      "Gas": 0.2802,
+      "Hydro": 0.3248,
+      "Nuclear": 0.1736,
+      "Other Fossil": 0.0123,
       "Other Renewables": 0,
-      "Solar": 0.009,
-      "Wind": 0.0298
+      "Solar": 0.0091,
+      "Wind": 0.0302
     }
   },
   "PL": {
@@ -10518,7 +10518,7 @@
     },
     "2023": {
       "Bioenergy": 0.0143,
-      "Coal": 0.6249,
+      "Coal": 0.6248,
       "Gas": 0.0861,
       "Hydro": 0.0173,
       "Nuclear": 0.0053,
@@ -10528,15 +10528,15 @@
       "Wind": 0.1447
     },
     "2024": {
-      "Bioenergy": 0.014,
-      "Coal": 0.547,
-      "Gas": 0.1003,
-      "Hydro": 0.0167,
-      "Nuclear": 0.0039,
-      "Other Fossil": 0.0374,
+      "Bioenergy": 0.0143,
+      "Coal": 0.5504,
+      "Gas": 0.1012,
+      "Hydro": 0.0171,
+      "Nuclear": 0.0045,
+      "Other Fossil": 0.0382,
       "Other Renewables": 0.0009,
-      "Solar": 0.133,
-      "Wind": 0.1468
+      "Solar": 0.128,
+      "Wind": 0.1454
     }
   },
   "PM": {
@@ -10665,14 +10665,14 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Coal": 0.1819,
-      "Gas": 0.3874,
+      "Coal": 0.1866,
+      "Gas": 0.3703,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": 0.4065,
+      "Other Fossil": 0.4186,
       "Other Renewables": 0,
-      "Solar": 0.0132,
-      "Wind": 0.011
+      "Solar": 0.0134,
+      "Wind": 0.0111
     }
   },
   "PS": {
@@ -10800,15 +10800,15 @@
       "Wind": 0.2837
     },
     "2024": {
-      "Bioenergy": 0.0699,
-      "Coal": 0.0283,
-      "Gas": 0.1349,
-      "Hydro": 0.2882,
-      "Nuclear": 0.0449,
-      "Other Fossil": 0.0093,
+      "Bioenergy": 0.0682,
+      "Coal": 0.0271,
+      "Gas": 0.1328,
+      "Hydro": 0.296,
+      "Nuclear": 0.043,
+      "Other Fossil": 0.0091,
       "Other Renewables": 0.0014,
-      "Solar": 0.1317,
-      "Wind": 0.2914
+      "Solar": 0.1253,
+      "Wind": 0.2972
     }
   },
   "PY": {
@@ -11072,15 +11072,15 @@
       "Wind": 0.1314
     },
     "2024": {
-      "Bioenergy": 0.0098,
-      "Coal": 0.1354,
-      "Gas": 0.1895,
-      "Hydro": 0.2838,
-      "Nuclear": 0.2099,
-      "Other Fossil": 0.0011,
+      "Bioenergy": 0.0101,
+      "Coal": 0.1358,
+      "Gas": 0.1907,
+      "Hydro": 0.2867,
+      "Nuclear": 0.2084,
+      "Other Fossil": 0.0012,
       "Other Renewables": 0.0004,
-      "Solar": 0.0504,
-      "Wind": 0.1198
+      "Solar": 0.0497,
+      "Wind": 0.1171
     }
   },
   "RS": {
@@ -11140,15 +11140,15 @@
       "Wind": 0.0268
     },
     "2024": {
-      "Bioenergy": 0.0093,
-      "Coal": 0.5872,
-      "Gas": 0.0283,
-      "Hydro": 0.3064,
-      "Nuclear": 0.0133,
-      "Other Fossil": 0.0084,
+      "Bioenergy": 0.0089,
+      "Coal": 0.5893,
+      "Gas": 0.0285,
+      "Hydro": 0.3093,
+      "Nuclear": 0.0114,
+      "Other Fossil": 0.0082,
       "Other Renewables": 0.0004,
-      "Solar": 0.0071,
-      "Wind": 0.0394
+      "Solar": 0.0063,
+      "Wind": 0.0377
     }
   },
   "RU": {
@@ -11616,15 +11616,15 @@
       "Wind": 0.2198
     },
     "2024": {
-      "Bioenergy": 0.0381,
+      "Bioenergy": 0.0379,
       "Coal": 0,
       "Gas": 0,
-      "Hydro": 0.4147,
-      "Nuclear": 0.3061,
+      "Hydro": 0.4102,
+      "Nuclear": 0.3062,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0145,
-      "Wind": 0.2266
+      "Solar": 0.0133,
+      "Wind": 0.2324
     }
   },
   "SG": {
@@ -11686,12 +11686,12 @@
     "2024": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.9568,
+      "Gas": 0.9562,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": 0.0236,
+      "Other Fossil": 0.0223,
       "Other Renewables": 0,
-      "Solar": 0.0195,
+      "Solar": 0.0215,
       "Wind": 0
     }
   },
@@ -11820,14 +11820,14 @@
       "Wind": 0.0058
     },
     "2024": {
-      "Bioenergy": 0.0087,
-      "Coal": 0.1957,
-      "Gas": 0.0308,
-      "Hydro": 0.3576,
-      "Nuclear": 0.3604,
+      "Bioenergy": 0.0085,
+      "Coal": 0.1973,
+      "Gas": 0.0304,
+      "Hydro": 0.3638,
+      "Nuclear": 0.3546,
       "Other Fossil": 0.0028,
       "Other Renewables": 0.0001,
-      "Solar": 0.0411,
+      "Solar": 0.0398,
       "Wind": 0.0028
     }
   },
@@ -11888,14 +11888,14 @@
       "Wind": 0
     },
     "2024": {
-      "Bioenergy": 0.0313,
-      "Coal": 0.0089,
-      "Gas": 0.0763,
-      "Hydro": 0.1806,
-      "Nuclear": 0.6186,
+      "Bioenergy": 0.0319,
+      "Coal": 0.0088,
+      "Gas": 0.0765,
+      "Hydro": 0.1783,
+      "Nuclear": 0.6209,
       "Other Fossil": 0.0443,
-      "Other Renewables": 0.0166,
-      "Solar": 0.0233,
+      "Other Renewables": 0.0165,
+      "Solar": 0.0227,
       "Wind": 0
     }
   },
@@ -12754,10 +12754,10 @@
       "Coal": 0.2532,
       "Gas": 0.5526,
       "Hydro": 0.0521,
-      "Nuclear": 0.0083,
+      "Nuclear": 0.0082,
       "Other Fossil": 0.0096,
       "Other Renewables": 0.0008,
-      "Solar": 0.0316,
+      "Solar": 0.0317,
       "Wind": 0.0238
     },
     "2023": {
@@ -12772,15 +12772,15 @@
       "Wind": 0.0263
     },
     "2024": {
-      "Bioenergy": 0.0617,
-      "Coal": 0.2108,
-      "Gas": 0.6114,
-      "Hydro": 0.0452,
-      "Nuclear": 0.0068,
-      "Other Fossil": 0.0015,
-      "Other Renewables": 0.0006,
-      "Solar": 0.0373,
-      "Wind": 0.0246
+      "Bioenergy": 0.0606,
+      "Coal": 0.2093,
+      "Gas": 0.6103,
+      "Hydro": 0.0454,
+      "Nuclear": 0.0074,
+      "Other Fossil": 0.0037,
+      "Other Renewables": 0.0007,
+      "Solar": 0.0366,
+      "Wind": 0.0261
     }
   },
   "TJ": {
@@ -13180,15 +13180,15 @@
       "Wind": 0.1063
     },
     "2024": {
-      "Bioenergy": 0.0252,
-      "Coal": 0.3489,
-      "Gas": 0.1747,
-      "Hydro": 0.234,
+      "Bioenergy": 0.0256,
+      "Coal": 0.3494,
+      "Gas": 0.172,
+      "Hydro": 0.2328,
       "Nuclear": 0.0004,
       "Other Fossil": 0.003,
-      "Other Renewables": 0.0289,
-      "Solar": 0.0822,
-      "Wind": 0.1026
+      "Other Renewables": 0.0293,
+      "Solar": 0.0818,
+      "Wind": 0.1058
     }
   },
   "TT": {
@@ -13588,15 +13588,15 @@
       "Wind": 0.1001
     },
     "2024": {
-      "Bioenergy": 0.0104,
-      "Coal": 0.1479,
-      "Gas": 0.4367,
-      "Hydro": 0.0513,
+      "Bioenergy": 0.0105,
+      "Coal": 0.147,
+      "Gas": 0.4308,
+      "Hydro": 0.0531,
       "Nuclear": 0.1757,
-      "Other Fossil": 0.0058,
-      "Other Renewables": 0.0039,
-      "Solar": 0.0716,
-      "Wind": 0.0968
+      "Other Fossil": 0.0069,
+      "Other Renewables": 0.004,
+      "Solar": 0.0719,
+      "Wind": 0.1002
     }
   },
   "UY": {
@@ -13656,15 +13656,15 @@
       "Wind": 0.4065
     },
     "2024": {
-      "Bioenergy": 0.1338,
+      "Bioenergy": 0.1311,
       "Coal": 0,
       "Gas": 0.0069,
-      "Hydro": 0.5006,
+      "Hydro": 0.5085,
       "Nuclear": 0,
       "Other Fossil": 0.0008,
       "Other Renewables": 0,
-      "Solar": 0.0283,
-      "Wind": 0.3297
+      "Solar": 0.0286,
+      "Wind": 0.3242
     }
   },
   "UZ": {
@@ -13727,12 +13727,12 @@
       "Bioenergy": 0.0004,
       "Coal": 0.0474,
       "Gas": 0.8346,
-      "Hydro": 0.1023,
+      "Hydro": 0.1022,
       "Nuclear": 0.001,
       "Other Fossil": 0.0111,
       "Other Renewables": 0.0001,
       "Solar": 0.0018,
-      "Wind": 0.0013
+      "Wind": 0.0014
     }
   },
   "VC": {
@@ -14065,14 +14065,14 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Coal": 0.4922,
-      "Gas": 0.0712,
-      "Hydro": 0.3102,
+      "Coal": 0.4985,
+      "Gas": 0.073,
+      "Hydro": 0.3019,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0889,
-      "Wind": 0.0375
+      "Solar": 0.0888,
+      "Wind": 0.0378
     }
   },
   "VU": {
@@ -14258,7 +14258,7 @@
     },
     "2023": {
       "Bioenergy": 0.0037,
-      "Coal": 0.7783,
+      "Coal": 0.7782,
       "Gas": 0.0328,
       "Hydro": 0.0752,
       "Nuclear": 0.0263,
@@ -14269,14 +14269,14 @@
     },
     "2024": {
       "Bioenergy": 0.002,
-      "Coal": 0.8571,
-      "Gas": 0.0174,
-      "Hydro": 0.0447,
-      "Nuclear": 0.0146,
-      "Other Fossil": 0.0014,
+      "Coal": 0.8564,
+      "Gas": 0.0176,
+      "Hydro": 0.045,
+      "Nuclear": 0.0147,
+      "Other Fossil": 0.0015,
       "Other Renewables": 0.0005,
-      "Solar": 0.0041,
-      "Wind": 0.0581
+      "Solar": 0.0039,
+      "Wind": 0.0585
     }
   },
   "YE": {
@@ -14405,14 +14405,14 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Coal": 0.8232,
+      "Coal": 0.8213,
       "Gas": 0.0005,
-      "Hydro": 0.0047,
-      "Nuclear": 0.0343,
-      "Other Fossil": 0.0122,
+      "Hydro": 0.005,
+      "Nuclear": 0.0312,
+      "Other Fossil": 0.0154,
       "Other Renewables": 0.001,
-      "Solar": 0.0765,
-      "Wind": 0.0475
+      "Solar": 0.0783,
+      "Wind": 0.0471
     }
   },
   "ZM": {