@digital4better/data 1.1.22 → 1.1.24

package/data/mix/country-yearly.json

@@ -205,21 +205,21 @@
   },
   "AL": {
     "2019": {
-      "Bioenergy": 0.0089,
+      "Bioenergy": 0.0088,
       "Coal": 0.0533,
       "Gas": 0.0824,
       "Hydro": 0.7325,
       "Nuclear": 0.0724,
       "Other Fossil": 0.0067,
-      "Other Renewables": 0.0019,
+      "Other Renewables": 0.002,
       "Solar": 0.0126,
-      "Wind": 0.0294
+      "Wind": 0.0293
     },
     "2020": {
       "Bioenergy": 0.0093,
       "Coal": 0.0471,
       "Gas": 0.0802,
-      "Hydro": 0.7375,
+      "Hydro": 0.7374,
       "Nuclear": 0.0688,
       "Other Fossil": 0.0065,
       "Other Renewables": 0.0021,
@@ -230,11 +230,11 @@
       "Bioenergy": 0.0095,
       "Coal": 0.0491,
       "Gas": 0.082,
-      "Hydro": 0.7338,
+      "Hydro": 0.7337,
       "Nuclear": 0.0698,
       "Other Fossil": 0.0065,
       "Other Renewables": 0.002,
-      "Solar": 0.0154,
+      "Solar": 0.0155,
       "Wind": 0.0318
     },
     "2022": {
@@ -244,7 +244,7 @@
       "Hydro": 0.7288,
       "Nuclear": 0.0625,
       "Other Fossil": 0.0066,
-      "Other Renewables": 0.002,
+      "Other Renewables": 0.0021,
       "Solar": 0.0187,
       "Wind": 0.0364
     },
@@ -263,12 +263,12 @@
       "Bioenergy": 0.0088,
       "Coal": 0.0447,
       "Gas": 0.0777,
-      "Hydro": 0.7353,
-      "Nuclear": 0.0633,
+      "Hydro": 0.7355,
+      "Nuclear": 0.0632,
       "Other Fossil": 0.0061,
       "Other Renewables": 0.0019,
       "Solar": 0.0117,
-      "Wind": 0.0505
+      "Wind": 0.0504
     }
   },
   "AM": {
@@ -568,7 +568,7 @@
     },
     "2021": {
       "Bioenergy": 0.0258,
-      "Coal": 0.0228,
+      "Coal": 0.0227,
       "Gas": 0.1786,
       "Hydro": 0.588,
       "Nuclear": 0.0309,
@@ -600,15 +600,15 @@
       "Wind": 0.1399
     },
     "2024": {
-      "Bioenergy": 0.0218,
+      "Bioenergy": 0.0211,
       "Coal": 0,
-      "Gas": 0.1516,
-      "Hydro": 0.5972,
+      "Gas": 0.1464,
+      "Hydro": 0.6111,
       "Nuclear": 0,
-      "Other Fossil": 0.0148,
+      "Other Fossil": 0.0143,
       "Other Renewables": 0,
-      "Solar": 0.0272,
-      "Wind": 0.1873
+      "Solar": 0.0263,
+      "Wind": 0.1809
     }
   },
   "AU": {
@@ -1084,7 +1084,7 @@
       "Other Fossil": 0.0848,
       "Other Renewables": 0.0006,
       "Solar": 0.0362,
-      "Wind": 0.2411
+      "Wind": 0.241
     }
   },
   "BF": {
@@ -2327,22 +2327,22 @@
       "Bioenergy": 0.0011,
       "Coal": 0.006,
       "Gas": 0.0101,
-      "Hydro": 0.566,
-      "Nuclear": 0.3302,
-      "Other Fossil": 0.0514,
+      "Hydro": 0.5655,
+      "Nuclear": 0.3303,
+      "Other Fossil": 0.0515,
       "Other Renewables": 0.0002,
-      "Solar": 0.0283,
+      "Solar": 0.0287,
       "Wind": 0.0066
     },
     "2021": {
       "Bioenergy": 0.0031,
       "Coal": 0.017,
       "Gas": 0.028,
-      "Hydro": 0.5641,
-      "Nuclear": 0.2895,
+      "Hydro": 0.557,
+      "Nuclear": 0.2896,
       "Other Fossil": 0.0537,
       "Other Renewables": 0.0006,
-      "Solar": 0.0307,
+      "Solar": 0.0376,
       "Wind": 0.0132
     },
     "2022": {
@@ -2371,11 +2371,11 @@
       "Bioenergy": 0.0001,
       "Coal": 0.0006,
       "Gas": 0.0011,
-      "Hydro": 0.5881,
-      "Nuclear": 0.3314,
-      "Other Fossil": 0.0489,
+      "Hydro": 0.589,
+      "Nuclear": 0.3306,
+      "Other Fossil": 0.0488,
       "Other Renewables": 0,
-      "Solar": 0.0273,
+      "Solar": 0.0272,
       "Wind": 0.0023
     }
   },
@@ -3269,7 +3269,7 @@
       "Coal": 0.1379,
       "Gas": 0.1217,
       "Hydro": 0.0315,
-      "Nuclear": 0.041,
+      "Nuclear": 0.0409,
       "Other Fossil": 0.0489,
       "Other Renewables": 0.0011,
       "Solar": 0.0355,
@@ -3316,7 +3316,7 @@
       "Nuclear": 0.02,
       "Other Fossil": 0.0358,
       "Other Renewables": 0.0006,
-      "Solar": 0.0912,
+      "Solar": 0.0913,
       "Wind": 0.5469
     },
     "2024": {
@@ -3622,19 +3622,19 @@
       "Hydro": 0.0825,
       "Nuclear": 0.0986,
       "Other Fossil": 0.3604,
-      "Other Renewables": 0.0029,
+      "Other Renewables": 0.003,
       "Solar": 0.031,
       "Wind": 0.1608
     },
     "2021": {
       "Bioenergy": 0.065,
-      "Coal": 0.0466,
+      "Coal": 0.0465,
       "Gas": 0.0791,
       "Hydro": 0.0538,
       "Nuclear": 0.0675,
       "Other Fossil": 0.5133,
-      "Other Renewables": 0.0019,
-      "Solar": 0.0488,
+      "Other Renewables": 0.002,
+      "Solar": 0.0489,
       "Wind": 0.1239
     },
     "2022": {
@@ -3655,20 +3655,20 @@
       "Hydro": 0.0706,
       "Nuclear": 0.0827,
       "Other Fossil": 0.3373,
-      "Other Renewables": 0.0026,
-      "Solar": 0.1151,
+      "Other Renewables": 0.0027,
+      "Solar": 0.1152,
       "Wind": 0.1559
     },
     "2024": {
       "Bioenergy": 0.0812,
       "Coal": 0.061,
-      "Gas": 0.1058,
-      "Hydro": 0.0764,
-      "Nuclear": 0.0864,
+      "Gas": 0.1059,
+      "Hydro": 0.0765,
+      "Nuclear": 0.0863,
       "Other Fossil": 0.3668,
       "Other Renewables": 0.0026,
-      "Solar": 0.0187,
-      "Wind": 0.201
+      "Solar": 0.0188,
+      "Wind": 0.2009
     }
   },
   "EG": {
@@ -4427,7 +4427,7 @@
       "Hydro": 0.0246,
       "Nuclear": 0.1996,
       "Other Fossil": 0.0042,
-      "Other Renewables": 0.0004,
+      "Other Renewables": 0.0005,
       "Solar": 0.0427,
       "Wind": 0.2177
     },
@@ -4484,7 +4484,7 @@
       "Other Fossil": 0.0119,
       "Other Renewables": 0.0006,
       "Solar": 0.0216,
-      "Wind": 0.3642
+      "Wind": 0.3641
     }
   },
   "GD": {
@@ -4762,68 +4762,68 @@
   "GI": {
     "2019": {
       "Bioenergy": 0.0397,
-      "Coal": 0.1667,
-      "Gas": 0.259,
-      "Hydro": 0.1598,
-      "Nuclear": 0.2228,
-      "Other Fossil": 0.0273,
-      "Other Renewables": 0.0045,
-      "Solar": 0.0298,
+      "Coal": 0.1671,
+      "Gas": 0.2587,
+      "Hydro": 0.1599,
+      "Nuclear": 0.2229,
+      "Other Fossil": 0.0271,
+      "Other Renewables": 0.0044,
+      "Solar": 0.0299,
       "Wind": 0.0904
     },
     "2020": {
       "Bioenergy": 0.0397,
-      "Coal": 0.1667,
-      "Gas": 0.259,
-      "Hydro": 0.1598,
-      "Nuclear": 0.2228,
-      "Other Fossil": 0.0273,
-      "Other Renewables": 0.0045,
-      "Solar": 0.0298,
+      "Coal": 0.1671,
+      "Gas": 0.2587,
+      "Hydro": 0.1599,
+      "Nuclear": 0.2229,
+      "Other Fossil": 0.0271,
+      "Other Renewables": 0.0044,
+      "Solar": 0.0299,
       "Wind": 0.0904
     },
     "2021": {
       "Bioenergy": 0.0397,
-      "Coal": 0.1667,
-      "Gas": 0.259,
-      "Hydro": 0.1598,
-      "Nuclear": 0.2228,
-      "Other Fossil": 0.0273,
-      "Other Renewables": 0.0045,
-      "Solar": 0.0298,
+      "Coal": 0.1671,
+      "Gas": 0.2587,
+      "Hydro": 0.1599,
+      "Nuclear": 0.2229,
+      "Other Fossil": 0.0271,
+      "Other Renewables": 0.0044,
+      "Solar": 0.0299,
       "Wind": 0.0904
     },
     "2022": {
       "Bioenergy": 0.0397,
-      "Coal": 0.1667,
-      "Gas": 0.259,
-      "Hydro": 0.1598,
-      "Nuclear": 0.2228,
-      "Other Fossil": 0.0273,
-      "Other Renewables": 0.0045,
-      "Solar": 0.0298,
+      "Coal": 0.1671,
+      "Gas": 0.2587,
+      "Hydro": 0.1599,
+      "Nuclear": 0.2229,
+      "Other Fossil": 0.0271,
+      "Other Renewables": 0.0044,
+      "Solar": 0.0299,
       "Wind": 0.0904
     },
     "2023": {
       "Bioenergy": 0.0397,
-      "Coal": 0.1667,
-      "Gas": 0.259,
-      "Hydro": 0.1598,
-      "Nuclear": 0.2228,
-      "Other Fossil": 0.0273,
-      "Other Renewables": 0.0045,
-      "Solar": 0.0298,
+      "Coal": 0.1671,
+      "Gas": 0.2587,
+      "Hydro": 0.1599,
+      "Nuclear": 0.2229,
+      "Other Fossil": 0.0271,
+      "Other Renewables": 0.0044,
+      "Solar": 0.0299,
       "Wind": 0.0904
     },
     "2024": {
       "Bioenergy": 0.0397,
-      "Coal": 0.1667,
-      "Gas": 0.259,
-      "Hydro": 0.1598,
-      "Nuclear": 0.2228,
-      "Other Fossil": 0.0273,
-      "Other Renewables": 0.0045,
-      "Solar": 0.0298,
+      "Coal": 0.1671,
+      "Gas": 0.2587,
+      "Hydro": 0.1599,
+      "Nuclear": 0.2229,
+      "Other Fossil": 0.0271,
+      "Other Renewables": 0.0044,
+      "Solar": 0.0299,
       "Wind": 0.0904
     }
   },
@@ -5171,7 +5171,7 @@
     "2019": {
       "Bioenergy": 0.0055,
       "Coal": 0.2452,
-      "Gas": 0.3951,
+      "Gas": 0.395,
       "Hydro": 0.0917,
       "Nuclear": 0.0452,
       "Other Fossil": 0.0042,
@@ -5194,7 +5194,7 @@
       "Bioenergy": 0.0024,
       "Coal": 0.1223,
       "Gas": 0.4656,
-      "Hydro": 0.1068,
+      "Hydro": 0.1067,
       "Nuclear": 0.0179,
       "Other Fossil": 0.0017,
       "Other Renewables": 0.0005,
@@ -5229,10 +5229,10 @@
       "Gas": 0.3522,
       "Hydro": 0.0776,
       "Nuclear": 0.0131,
-      "Other Fossil": 0.0013,
+      "Other Fossil": 0.0012,
       "Other Renewables": 0.0004,
-      "Solar": 0.1454,
-      "Wind": 0.3025
+      "Solar": 0.1455,
+      "Wind": 0.3024
     }
   },
   "GT": {
@@ -5651,7 +5651,7 @@
       "Hydro": 0.3587,
       "Nuclear": 0.0805,
       "Other Fossil": 0.0102,
-      "Other Renewables": 0.0282,
+      "Other Renewables": 0.0283,
       "Solar": 0.0173,
       "Wind": 0.1137
     },
@@ -5674,7 +5674,7 @@
       "Nuclear": 0.055,
       "Other Fossil": 0.0073,
       "Other Renewables": 0.0284,
-      "Solar": 0.0172,
+      "Solar": 0.0173,
       "Wind": 0.138
     },
     "2022": {
@@ -5684,15 +5684,15 @@
       "Hydro": 0.2985,
       "Nuclear": 0.0577,
       "Other Fossil": 0.0072,
-      "Other Renewables": 0.0244,
+      "Other Renewables": 0.0245,
       "Solar": 0.0218,
       "Wind": 0.1611
     },
     "2023": {
       "Bioenergy": 0.0384,
       "Coal": 0.0892,
-      "Gas": 0.228,
-      "Hydro": 0.4126,
+      "Gas": 0.2279,
+      "Hydro": 0.4125,
       "Nuclear": 0.0299,
       "Other Fossil": 0.009,
       "Other Renewables": 0.0156,
@@ -5703,12 +5703,12 @@
       "Bioenergy": 0.0415,
       "Coal": 0.024,
       "Gas": 0.2456,
-      "Hydro": 0.4247,
-      "Nuclear": 0.034,
-      "Other Fossil": 0.01,
+      "Hydro": 0.4248,
+      "Nuclear": 0.0339,
+      "Other Fossil": 0.0099,
       "Other Renewables": 0.0144,
       "Solar": 0.0116,
-      "Wind": 0.1944
+      "Wind": 0.1943
     }
   },
   "HT": {
@@ -5784,7 +5784,7 @@
       "Bioenergy": 0.0302,
       "Coal": 0.1406,
       "Gas": 0.2465,
-      "Hydro": 0.0534,
+      "Hydro": 0.0533,
       "Nuclear": 0.4157,
       "Other Fossil": 0.0257,
       "Other Renewables": 0.0045,
@@ -5793,7 +5793,7 @@
     },
     "2020": {
       "Bioenergy": 0.0312,
-      "Coal": 0.1263,
+      "Coal": 0.1262,
       "Gas": 0.2516,
       "Hydro": 0.0538,
       "Nuclear": 0.404,
@@ -5804,12 +5804,12 @@
     },
     "2021": {
       "Bioenergy": 0.0326,
-      "Coal": 0.109,
+      "Coal": 0.1089,
       "Gas": 0.2587,
-      "Hydro": 0.0511,
+      "Hydro": 0.051,
       "Nuclear": 0.3878,
       "Other Fossil": 0.0224,
-      "Other Renewables": 0.0043,
+      "Other Renewables": 0.0044,
       "Solar": 0.0919,
       "Wind": 0.0423
     },
@@ -5832,19 +5832,19 @@
       "Nuclear": 0.3909,
       "Other Fossil": 0.0193,
       "Other Renewables": 0.0027,
-      "Solar": 0.1596,
-      "Wind": 0.0476
+      "Solar": 0.1597,
+      "Wind": 0.0475
     },
     "2024": {
-      "Bioenergy": 0.0299,
+      "Bioenergy": 0.0298,
       "Coal": 0.0998,
       "Gas": 0.2391,
-      "Hydro": 0.0598,
-      "Nuclear": 0.375,
-      "Other Fossil": 0.021,
-      "Other Renewables": 0.0031,
-      "Solar": 0.1022,
-      "Wind": 0.0701
+      "Hydro": 0.0599,
+      "Nuclear": 0.3749,
+      "Other Fossil": 0.0209,
+      "Other Renewables": 0.0032,
+      "Solar": 0.1023,
+      "Wind": 0.07
     }
   },
   "ID": {
@@ -5945,7 +5945,7 @@
       "Hydro": 0.0332,
       "Nuclear": 0.0119,
       "Other Fossil": 0.0785,
-      "Other Renewables": 0.0003,
+      "Other Renewables": 0.0004,
       "Solar": 0.003,
       "Wind": 0.3136
     },
@@ -5967,7 +5967,7 @@
       "Hydro": 0.046,
       "Nuclear": 0.0203,
       "Other Fossil": 0.0367,
-      "Other Renewables": 0.0006,
+      "Other Renewables": 0.0007,
       "Solar": 0.0183,
       "Wind": 0.3546
     },
@@ -5975,7 +5975,7 @@
       "Bioenergy": 0.0062,
       "Coal": 0.0519,
       "Gas": 0.4107,
-      "Hydro": 0.0589,
+      "Hydro": 0.059,
       "Nuclear": 0.0204,
       "Other Fossil": 0.0361,
       "Other Renewables": 0.0006,
@@ -6383,12 +6383,12 @@
       "Bioenergy": 0.0578,
       "Coal": 0.0498,
       "Gas": 0.4382,
-      "Hydro": 0.1451,
+      "Hydro": 0.1452,
       "Nuclear": 0.0466,
-      "Other Fossil": 0.0358,
+      "Other Fossil": 0.0357,
       "Other Renewables": 0.0193,
-      "Solar": 0.068,
-      "Wind": 0.1395
+      "Solar": 0.0681,
+      "Wind": 0.1394
     }
   },
   "JM": {
@@ -7755,11 +7755,11 @@
     "2019": {
       "Bioenergy": 0.0548,
       "Coal": 0.128,
-      "Gas": 0.2291,
-      "Hydro": 0.1561,
+      "Gas": 0.229,
+      "Hydro": 0.156,
       "Nuclear": 0.1734,
       "Other Fossil": 0.0409,
-      "Other Renewables": 0.0046,
+      "Other Renewables": 0.0047,
       "Solar": 0.0291,
       "Wind": 0.1839
     },
@@ -7767,22 +7767,22 @@
       "Bioenergy": 0.0533,
       "Coal": 0.0997,
       "Gas": 0.2932,
-      "Hydro": 0.1417,
+      "Hydro": 0.1416,
       "Nuclear": 0.1451,
       "Other Fossil": 0.0375,
-      "Other Renewables": 0.0043,
+      "Other Renewables": 0.0044,
       "Solar": 0.03,
       "Wind": 0.1953
     },
     "2021": {
       "Bioenergy": 0.0533,
-      "Coal": 0.1132,
+      "Coal": 0.1131,
       "Gas": 0.2761,
-      "Hydro": 0.1489,
+      "Hydro": 0.1488,
       "Nuclear": 0.1596,
       "Other Fossil": 0.0362,
-      "Other Renewables": 0.0045,
-      "Solar": 0.0365,
+      "Other Renewables": 0.0046,
+      "Solar": 0.0366,
       "Wind": 0.1716
     },
     "2022": {
@@ -7798,38 +7798,38 @@
     },
     "2023": {
       "Bioenergy": 0.0386,
-      "Coal": 0.088,
+      "Coal": 0.0879,
       "Gas": 0.1963,
-      "Hydro": 0.1353,
+      "Hydro": 0.1352,
       "Nuclear": 0.1205,
       "Other Fossil": 0.0571,
-      "Other Renewables": 0.0038,
-      "Solar": 0.0881,
+      "Other Renewables": 0.0039,
+      "Solar": 0.0882,
       "Wind": 0.2723
     },
     "2024": {
       "Bioenergy": 0.0307,
       "Coal": 0.0716,
       "Gas": 0.2162,
-      "Hydro": 0.1311,
-      "Nuclear": 0.1012,
-      "Other Fossil": 0.0598,
+      "Hydro": 0.1313,
+      "Nuclear": 0.101,
+      "Other Fossil": 0.0597,
       "Other Renewables": 0.003,
-      "Solar": 0.0225,
-      "Wind": 0.364
+      "Solar": 0.0226,
+      "Wind": 0.3639
     }
   },
   "LU": {
     "2019": {
       "Bioenergy": 0.0572,
-      "Coal": 0.1341,
+      "Coal": 0.134,
       "Gas": 0.2555,
       "Hydro": 0.1486,
       "Nuclear": 0.1817,
       "Other Fossil": 0.0402,
-      "Other Renewables": 0.0048,
+      "Other Renewables": 0.0049,
       "Solar": 0.0499,
-      "Wind": 0.1281
+      "Wind": 0.128
     },
     "2020": {
       "Bioenergy": 0.0716,
@@ -7844,13 +7844,13 @@
     },
     "2021": {
       "Bioenergy": 0.0794,
-      "Coal": 0.1193,
+      "Coal": 0.1192,
       "Gas": 0.2397,
       "Hydro": 0.1481,
       "Nuclear": 0.1688,
       "Other Fossil": 0.0371,
-      "Other Renewables": 0.0048,
-      "Solar": 0.0651,
+      "Other Renewables": 0.0049,
+      "Solar": 0.0652,
       "Wind": 0.1376
     },
     "2022": {
@@ -7858,7 +7858,7 @@
       "Coal": 0.1274,
       "Gas": 0.2285,
       "Hydro": 0.1305,
-      "Nuclear": 0.1505,
+      "Nuclear": 0.1504,
       "Other Fossil": 0.0376,
       "Other Renewables": 0.0049,
       "Solar": 0.0873,
@@ -7871,20 +7871,20 @@
       "Hydro": 0.1446,
       "Nuclear": 0.151,
       "Other Fossil": 0.0362,
-      "Other Renewables": 0.0048,
-      "Solar": 0.0978,
+      "Other Renewables": 0.0049,
+      "Solar": 0.0979,
       "Wind": 0.2013
     },
     "2024": {
-      "Bioenergy": 0.0555,
+      "Bioenergy": 0.0554,
       "Coal": 0.1048,
-      "Gas": 0.2057,
-      "Hydro": 0.1541,
-      "Nuclear": 0.1481,
-      "Other Fossil": 0.0376,
+      "Gas": 0.2058,
+      "Hydro": 0.1544,
+      "Nuclear": 0.1479,
+      "Other Fossil": 0.0375,
       "Other Renewables": 0.0044,
-      "Solar": 0.0439,
-      "Wind": 0.2459
+      "Solar": 0.044,
+      "Wind": 0.2457
     }
   },
   "LV": {
@@ -7893,7 +7893,7 @@
       "Coal": 0.0275,
       "Gas": 0.4215,
       "Hydro": 0.3041,
-      "Nuclear": 0.0374,
+      "Nuclear": 0.0373,
       "Other Fossil": 0.0863,
       "Other Renewables": 0.001,
       "Solar": 0.0055,
@@ -7917,7 +7917,7 @@
       "Hydro": 0.3885,
       "Nuclear": 0.0577,
       "Other Fossil": 0.0711,
-      "Other Renewables": 0.0016,
+      "Other Renewables": 0.0017,
       "Solar": 0.0122,
       "Wind": 0.0406
     },
@@ -7928,19 +7928,19 @@
       "Hydro": 0.4338,
       "Nuclear": 0.0681,
       "Other Fossil": 0.0447,
-      "Other Renewables": 0.0022,
+      "Other Renewables": 0.0023,
       "Solar": 0.02,
       "Wind": 0.0627
     },
     "2023": {
       "Bioenergy": 0.0374,
-      "Coal": 0.039,
+      "Coal": 0.0389,
       "Gas": 0.2537,
-      "Hydro": 0.4973,
+      "Hydro": 0.4972,
       "Nuclear": 0.0581,
       "Other Fossil": 0.0243,
-      "Other Renewables": 0.0018,
-      "Solar": 0.0231,
+      "Other Renewables": 0.0019,
+      "Solar": 0.0232,
       "Wind": 0.0653
     },
     "2024": {
@@ -8096,7 +8096,7 @@
       "Bioenergy": 0.0044,
       "Coal": 0.5028,
       "Gas": 0.3842,
-      "Hydro": 0.0642,
+      "Hydro": 0.0641,
       "Nuclear": 0.023,
       "Other Fossil": 0.0021,
       "Other Renewables": 0.0006,
@@ -8128,7 +8128,7 @@
     "2022": {
       "Bioenergy": 0.0048,
       "Coal": 0.0276,
-      "Gas": 0.8345,
+      "Gas": 0.8344,
       "Hydro": 0.0718,
       "Nuclear": 0.0309,
       "Other Fossil": 0.0033,
@@ -8150,10 +8150,10 @@
     "2024": {
       "Bioenergy": 0.0025,
       "Coal": 0.0127,
-      "Gas": 0.8724,
+      "Gas": 0.8725,
       "Hydro": 0.0558,
       "Nuclear": 0.0179,
-      "Other Fossil": 0.0018,
+      "Other Fossil": 0.0017,
       "Other Renewables": 0.0005,
       "Solar": 0.0022,
       "Wind": 0.0341
@@ -8162,12 +8162,12 @@
   "ME": {
     "2019": {
       "Bioenergy": 0.0073,
-      "Coal": 0.3524,
+      "Coal": 0.3523,
       "Gas": 0.0682,
       "Hydro": 0.4066,
       "Nuclear": 0.0601,
       "Other Fossil": 0.0055,
-      "Other Renewables": 0.0016,
+      "Other Renewables": 0.0017,
       "Solar": 0.01,
       "Wind": 0.0883
     },
@@ -8301,7 +8301,7 @@
       "Coal": 0.4905,
       "Gas": 0.1936,
       "Hydro": 0.1989,
-      "Nuclear": 0.0562,
+      "Nuclear": 0.0561,
       "Other Fossil": 0.0053,
       "Other Renewables": 0.0015,
       "Solar": 0.0058,
@@ -8311,7 +8311,7 @@
       "Bioenergy": 0.0109,
       "Coal": 0.3805,
       "Gas": 0.2334,
-      "Hydro": 0.2309,
+      "Hydro": 0.2308,
       "Nuclear": 0.0713,
       "Other Fossil": 0.0066,
       "Other Renewables": 0.0021,
@@ -8320,47 +8320,47 @@
     },
     "2021": {
       "Bioenergy": 0.0111,
-      "Coal": 0.3171,
+      "Coal": 0.317,
       "Gas": 0.2863,
       "Hydro": 0.2445,
       "Nuclear": 0.0711,
       "Other Fossil": 0.0066,
       "Other Renewables": 0.002,
-      "Solar": 0.0112,
+      "Solar": 0.0113,
       "Wind": 0.05
     },
     "2022": {
       "Bioenergy": 0.0101,
       "Coal": 0.4232,
       "Gas": 0.1917,
-      "Hydro": 0.2267,
+      "Hydro": 0.2266,
       "Nuclear": 0.0483,
       "Other Fossil": 0.0402,
-      "Other Renewables": 0.0015,
+      "Other Renewables": 0.0016,
       "Solar": 0.0127,
       "Wind": 0.0456
     },
     "2023": {
       "Bioenergy": 0.0086,
-      "Coal": 0.41,
-      "Gas": 0.2301,
-      "Hydro": 0.2546,
-      "Nuclear": 0.0026,
-      "Other Fossil": 0.0587,
-      "Other Renewables": 0.0001,
-      "Solar": 0.0081,
-      "Wind": 0.0272
+      "Coal": 0.3903,
+      "Gas": 0.2125,
+      "Hydro": 0.2497,
+      "Nuclear": 0.0061,
+      "Other Fossil": 0.0556,
+      "Other Renewables": 0.0002,
+      "Solar": 0.0485,
+      "Wind": 0.0285
     },
     "2024": {
-      "Bioenergy": 0.0189,
-      "Coal": 0.4528,
-      "Gas": 0.2264,
-      "Hydro": 0.2453,
-      "Nuclear": 0,
-      "Other Fossil": 0,
-      "Other Renewables": 0,
-      "Solar": 0.0189,
-      "Wind": 0.0377
+      "Bioenergy": 0.02,
+      "Coal": 0.4085,
+      "Gas": 0.149,
+      "Hydro": 0.2914,
+      "Nuclear": 0.0336,
+      "Other Fossil": 0.0032,
+      "Other Renewables": 0.001,
+      "Solar": 0.0356,
+      "Wind": 0.0576
     }
   },
   "ML": {
@@ -8853,7 +8853,7 @@
     },
     "2020": {
       "Bioenergy": 0.0054,
-      "Coal": 0.029,
+      "Coal": 0.0289,
       "Gas": 0.8402,
       "Hydro": 0.0325,
       "Nuclear": 0.04,
@@ -8866,9 +8866,9 @@
       "Bioenergy": 0.0065,
       "Coal": 0.0353,
       "Gas": 0.8219,
-      "Hydro": 0.036,
+      "Hydro": 0.0359,
       "Nuclear": 0.0482,
-      "Other Fossil": 0.021,
+      "Other Fossil": 0.0211,
       "Other Renewables": 0.0014,
       "Solar": 0.0079,
       "Wind": 0.0218
@@ -8886,7 +8886,7 @@
     },
     "2023": {
       "Bioenergy": 0.006,
-      "Coal": 0.0318,
+      "Coal": 0.0317,
       "Gas": 0.7208,
       "Hydro": 0.0375,
       "Nuclear": 0.044,
@@ -8896,15 +8896,15 @@
       "Wind": 0.0284
     },
     "2024": {
-      "Bioenergy": 0.0108,
-      "Coal": 0.0551,
-      "Gas": 0.6608,
-      "Hydro": 0.0689,
-      "Nuclear": 0.0779,
-      "Other Fossil": 0.0075,
-      "Other Renewables": 0.0023,
-      "Solar": 0.0545,
-      "Wind": 0.0622
+      "Bioenergy": 0.0081,
+      "Coal": 0.041,
+      "Gas": 0.6963,
+      "Hydro": 0.0514,
+      "Nuclear": 0.058,
+      "Other Fossil": 0.0056,
+      "Other Renewables": 0.0017,
+      "Solar": 0.0916,
+      "Wind": 0.0463
     }
   },
   "MU": {
@@ -9701,26 +9701,26 @@
       "Wind": 0.1853
     },
     "2023": {
-      "Bioenergy": 0.0599,
-      "Coal": 0.0867,
-      "Gas": 0.3801,
+      "Bioenergy": 0.0605,
+      "Coal": 0.0866,
+      "Gas": 0.3798,
       "Hydro": 0.0012,
-      "Nuclear": 0.033,
-      "Other Fossil": 0.0137,
+      "Nuclear": 0.0328,
+      "Other Fossil": 0.0136,
       "Other Renewables": 0.0038,
-      "Solar": 0.1719,
-      "Wind": 0.2497
+      "Solar": 0.1751,
+      "Wind": 0.2466
     },
     "2024": {
-      "Bioenergy": 0.0583,
-      "Coal": 0.0976,
-      "Gas": 0.4274,
+      "Bioenergy": 0.0537,
+      "Coal": 0.1004,
+      "Gas": 0.438,
       "Hydro": 0,
-      "Nuclear": 0.0384,
-      "Other Fossil": 0.0076,
-      "Other Renewables": 0.0033,
-      "Solar": 0.0592,
-      "Wind": 0.3083
+      "Nuclear": 0.0374,
+      "Other Fossil": 0.0069,
+      "Other Renewables": 0.0032,
+      "Solar": 0.0641,
+      "Wind": 0.2963
     }
   },
   "NO": {
@@ -10558,7 +10558,7 @@
       "Hydro": 0.0261,
       "Nuclear": 0.018,
       "Other Fossil": 0.014,
-      "Other Renewables": 0.0005,
+      "Other Renewables": 0.0006,
       "Solar": 0.0172,
       "Wind": 0.1079
     },
@@ -10599,7 +10599,7 @@
       "Bioenergy": 0.0125,
       "Coal": 0.5844,
       "Gas": 0.1092,
-      "Hydro": 0.0223,
+      "Hydro": 0.0224,
       "Nuclear": 0.006,
       "Other Fossil": 0.0226,
       "Other Renewables": 0.0002,
@@ -10819,7 +10819,7 @@
       "Hydro": 0.1522,
       "Nuclear": 0.0208,
       "Other Fossil": 0.0089,
-      "Other Renewables": 0.0005,
+      "Other Renewables": 0.0006,
       "Solar": 0.0242,
       "Wind": 0.2737
     },
@@ -10841,7 +10841,7 @@
       "Hydro": 0.2144,
       "Nuclear": 0.0258,
       "Other Fossil": 0.0073,
-      "Other Renewables": 0.0007,
+      "Other Renewables": 0.0008,
       "Solar": 0.041,
       "Wind": 0.274
     },
@@ -10852,19 +10852,19 @@
       "Hydro": 0.1354,
       "Nuclear": 0.0383,
       "Other Fossil": 0.008,
-      "Other Renewables": 0.0012,
+      "Other Renewables": 0.0013,
       "Solar": 0.0615,
       "Wind": 0.2774
     },
     "2023": {
-      "Bioenergy": 0.0639,
+      "Bioenergy": 0.064,
       "Coal": 0.0289,
       "Gas": 0.2489,
       "Hydro": 0.2344,
-      "Nuclear": 0.0426,
+      "Nuclear": 0.0425,
       "Other Fossil": 0.0079,
       "Other Renewables": 0.0014,
-      "Solar": 0.088,
+      "Solar": 0.0881,
       "Wind": 0.2839
     },
     "2024": {
@@ -11181,14 +11181,14 @@
       "Hydro": 0.31,
       "Nuclear": 0.0122,
       "Other Fossil": 0.0231,
-      "Other Renewables": 0.0003,
+      "Other Renewables": 0.0004,
       "Solar": 0.0017,
       "Wind": 0.035
     },
     "2022": {
       "Bioenergy": 0.0098,
       "Coal": 0.6147,
-      "Gas": 0.0471,
+      "Gas": 0.047,
       "Hydro": 0.2548,
       "Nuclear": 0.0207,
       "Other Fossil": 0.0091,
@@ -11872,7 +11872,7 @@
       "Hydro": 0.241,
       "Nuclear": 0.4159,
       "Other Fossil": 0.0111,
-      "Other Renewables": 0.0006,
+      "Other Renewables": 0.0007,
       "Solar": 0.0236,
       "Wind": 0.0133
     },
@@ -11924,7 +11924,7 @@
     },
     "2021": {
       "Bioenergy": 0.0308,
-      "Coal": 0.0511,
+      "Coal": 0.051,
       "Gas": 0.1407,
       "Hydro": 0.1457,
       "Nuclear": 0.533,
@@ -14322,7 +14322,7 @@
       "Other Fossil": 0.0018,
       "Other Renewables": 0.0005,
       "Solar": 0.0017,
-      "Wind": 0.0611
+      "Wind": 0.061
     },
     "2023": {
       "Bioenergy": 0.0038,
@@ -14332,19 +14332,19 @@
       "Nuclear": 0.0265,
       "Other Fossil": 0.0027,
       "Other Renewables": 0.0008,
-      "Solar": 0.0061,
+      "Solar": 0.0062,
       "Wind": 0.0741
     },
     "2024": {
       "Bioenergy": 0.0054,
       "Coal": 0.7348,
       "Gas": 0.0477,
-      "Hydro": 0.0831,
+      "Hydro": 0.0832,
       "Nuclear": 0.0388,
       "Other Fossil": 0.0037,
       "Other Renewables": 0.0012,
-      "Solar": 0.0055,
-      "Wind": 0.0798
+      "Solar": 0.0056,
+      "Wind": 0.0797
     }
   },
   "YE": {