npm - @digital4better/data - Versions diffs - 1.1.40 → 1.1.41 - Mend

@digital4better/data 1.1.40 → 1.1.41

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (56) hide show

package/data/factor/continent-monthly-green.csv +145 -145
package/data/factor/continent-monthly-green.json +1287 -1287
package/data/factor/continent-monthly.csv +151 -151
package/data/factor/continent-monthly.json +1320 -1320
package/data/factor/continent-yearly-green.csv +16 -16
package/data/factor/continent-yearly-green.json +143 -143
package/data/factor/continent-yearly.csv +18 -18
package/data/factor/continent-yearly.json +148 -148
package/data/factor/country-monthly-green.csv +1213 -1213
package/data/factor/country-monthly-green.json +10083 -10083
package/data/factor/country-monthly.csv +1355 -1355
package/data/factor/country-monthly.json +9172 -9172
package/data/factor/country-yearly-green.csv +234 -234
package/data/factor/country-yearly-green.json +2059 -2059
package/data/factor/country-yearly.csv +242 -242
package/data/factor/country-yearly.json +1731 -1731
package/data/factor/subdivision-yearly-green.csv +50 -50
package/data/factor/subdivision-yearly-green.json +327 -327
package/data/factor/subdivision-yearly.csv +49 -49
package/data/factor/subdivision-yearly.json +246 -246
package/data/factor/world-monthly-green.csv +66 -66
package/data/factor/world-monthly-green.json +590 -590
package/data/factor/world-monthly.csv +66 -66
package/data/factor/world-monthly.json +588 -588
package/data/factor/world-yearly-green.csv +6 -6
package/data/factor/world-yearly-green.json +54 -54
package/data/factor/world-yearly.csv +6 -6
package/data/factor/world-yearly.json +54 -54
package/data/mix/continent-monthly-green.csv +136 -136
package/data/mix/continent-monthly-green.json +335 -335
package/data/mix/continent-monthly.csv +136 -136
package/data/mix/continent-monthly.json +504 -504
package/data/mix/continent-yearly-green.csv +14 -14
package/data/mix/continent-yearly-green.json +35 -35
package/data/mix/continent-yearly.csv +14 -14
package/data/mix/continent-yearly.json +57 -57
package/data/mix/country-monthly-green.csv +885 -885
package/data/mix/country-monthly-green.json +2801 -2801
package/data/mix/country-monthly.csv +885 -885
package/data/mix/country-monthly.json +3785 -3785
package/data/mix/country-yearly-green.csv +117 -117
package/data/mix/country-yearly-green.json +362 -362
package/data/mix/country-yearly.csv +117 -117
package/data/mix/country-yearly.json +621 -621
package/data/mix/subdivision-yearly-green.csv +1 -1
package/data/mix/subdivision-yearly.csv +1 -1
package/data/mix/subdivision-yearly.json +1 -1
package/data/mix/world-monthly-green.csv +66 -66
package/data/mix/world-monthly-green.json +116 -116
package/data/mix/world-monthly.csv +66 -66
package/data/mix/world-monthly.json +197 -197
package/data/mix/world-yearly-green.csv +6 -6
package/data/mix/world-yearly-green.json +8 -8
package/data/mix/world-yearly.csv +6 -6
package/data/mix/world-yearly.json +19 -19
package/package.json +1 -1

package/data/mix/country-yearly.json CHANGED Viewed

@@ -124,15 +124,15 @@
       "Wind": 0.0577
     },
     "2024": {
-      "Bioenergy": 0.0156,
-      "Coal": 0.4789,
-      "Gas": 0.0829,
-      "Hydro": 0.2166,
-      "Nuclear": 0.044,
+      "Bioenergy": 0.0153,
+      "Coal": 0.4711,
+      "Gas": 0.0822,
+      "Hydro": 0.2249,
+      "Nuclear": 0.0435,
       "Other Fossil": 0.0215,
-      "Other Renewables": 0.0042,
-      "Solar": 0.0682,
-      "Wind": 0.0681
+      "Other Renewables": 0.0041,
+      "Solar": 0.0706,
+      "Wind": 0.0667
     }
   },
   "AG": {
@@ -228,7 +228,7 @@
     },
     "2021": {
       "Bioenergy": 0.0095,
-      "Coal": 0.0489,
+      "Coal": 0.049,
       "Gas": 0.0815,
       "Hydro": 0.7349,
       "Nuclear": 0.0696,
@@ -250,8 +250,8 @@
     },
     "2023": {
       "Bioenergy": 0.0088,
-      "Coal": 0.0463,
-      "Gas": 0.0765,
+      "Coal": 0.0462,
+      "Gas": 0.0766,
       "Hydro": 0.7354,
       "Nuclear": 0.063,
       "Other Fossil": 0.0062,
@@ -260,15 +260,15 @@
       "Wind": 0.04
     },
     "2024": {
-      "Bioenergy": 0.0094,
-      "Coal": 0.0401,
+      "Bioenergy": 0.0091,
+      "Coal": 0.0404,
       "Gas": 0.07,
-      "Hydro": 0.7436,
-      "Nuclear": 0.0624,
+      "Hydro": 0.7432,
+      "Nuclear": 0.0621,
       "Other Fossil": 0.0058,
-      "Other Renewables": 0.0021,
-      "Solar": 0.025,
-      "Wind": 0.0417
+      "Other Renewables": 0.002,
+      "Solar": 0.0254,
+      "Wind": 0.0419
     }
   },
   "AM": {
@@ -466,13 +466,13 @@
     "2024": {
       "Bioenergy": 0.0073,
       "Coal": 0.0018,
-      "Gas": 0.5103,
-      "Hydro": 0.2553,
+      "Gas": 0.5105,
+      "Hydro": 0.255,
       "Nuclear": 0.0879,
-      "Other Fossil": 0.013,
+      "Other Fossil": 0.0131,
       "Other Renewables": 0.0001,
       "Solar": 0.0242,
-      "Wind": 0.1001
+      "Wind": 0.1002
     }
   },
   "AS": {
@@ -580,13 +580,13 @@
     "2022": {
       "Bioenergy": 0.0421,
       "Coal": 0.0248,
-      "Gas": 0.1901,
+      "Gas": 0.1902,
       "Hydro": 0.5494,
       "Nuclear": 0.0284,
       "Other Fossil": 0.019,
       "Other Renewables": 0.0009,
       "Solar": 0.0208,
-      "Wind": 0.1245
+      "Wind": 0.1244
     },
     "2023": {
       "Bioenergy": 0.0241,
@@ -600,15 +600,15 @@
       "Wind": 0.1398
     },
     "2024": {
-      "Bioenergy": 0.0281,
+      "Bioenergy": 0.0265,
       "Coal": 0,
-      "Gas": 0.0761,
-      "Hydro": 0.6419,
+      "Gas": 0.0759,
+      "Hydro": 0.6469,
       "Nuclear": 0,
       "Other Fossil": 0.0152,
       "Other Renewables": 0,
-      "Solar": 0.0824,
-      "Wind": 0.1562
+      "Solar": 0.0836,
+      "Wind": 0.1519
     }
   },
   "AU": {
@@ -668,15 +668,15 @@
       "Wind": 0.1345
     },
     "2024": {
-      "Bioenergy": 0.0014,
-      "Coal": 0.5613,
-      "Gas": 0.0772,
-      "Hydro": 0.0539,
+      "Bioenergy": 0.0015,
+      "Coal": 0.5633,
+      "Gas": 0.0808,
+      "Hydro": 0.0543,
       "Nuclear": 0,
       "Other Fossil": 0.0003,
       "Other Renewables": 0,
-      "Solar": 0.1851,
-      "Wind": 0.1208
+      "Solar": 0.1806,
+      "Wind": 0.1192
     }
   },
   "AW": {
@@ -1008,15 +1008,15 @@
       "Wind": 0.0117
     },
     "2024": {
-      "Bioenergy": 0.0031,
-      "Coal": 0.3759,
-      "Gas": 0.4666,
-      "Hydro": 0.0185,
-      "Nuclear": 0.0088,
+      "Bioenergy": 0.003,
+      "Coal": 0.3742,
+      "Gas": 0.4665,
+      "Hydro": 0.0203,
+      "Nuclear": 0.0087,
       "Other Fossil": 0.0909,
       "Other Renewables": 0.0008,
-      "Solar": 0.0217,
-      "Wind": 0.0136
+      "Solar": 0.0222,
+      "Wind": 0.0133
     }
   },
   "BE": {
@@ -1076,15 +1076,15 @@
       "Wind": 0.1829
     },
     "2024": {
-      "Bioenergy": 0.0106,
-      "Coal": 0.0169,
-      "Gas": 0.1514,
-      "Hydro": 0.0274,
-      "Nuclear": 0.4111,
-      "Other Fossil": 0.0827,
-      "Other Renewables": 0.0009,
-      "Solar": 0.1085,
-      "Wind": 0.1904
+      "Bioenergy": 0.0102,
+      "Coal": 0.0156,
+      "Gas": 0.1524,
+      "Hydro": 0.0248,
+      "Nuclear": 0.4084,
+      "Other Fossil": 0.0834,
+      "Other Renewables": 0.0008,
+      "Solar": 0.1129,
+      "Wind": 0.1915
     }
   },
   "BF": {
@@ -1212,15 +1212,15 @@
       "Wind": 0.0386
     },
     "2024": {
-      "Bioenergy": 0.0039,
-      "Coal": 0.2359,
-      "Gas": 0.0671,
-      "Hydro": 0.1151,
-      "Nuclear": 0.4189,
-      "Other Fossil": 0.0005,
-      "Other Renewables": 0.0001,
-      "Solar": 0.1155,
-      "Wind": 0.043
+      "Bioenergy": 0.0041,
+      "Coal": 0.2333,
+      "Gas": 0.0683,
+      "Hydro": 0.1103,
+      "Nuclear": 0.4195,
+      "Other Fossil": 0.0006,
+      "Other Renewables": 0.0002,
+      "Solar": 0.1219,
+      "Wind": 0.0417
     }
   },
   "BH": {
@@ -1620,15 +1620,15 @@
       "Wind": 0.0434
     },
     "2024": {
-      "Bioenergy": 0,
+      "Bioenergy": 0.0034,
       "Coal": 0,
-      "Gas": 0.6356,
-      "Hydro": 0.2966,
+      "Gas": 0.6455,
+      "Hydro": 0.2791,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0288,
-      "Wind": 0.039
+      "Solar": 0.0291,
+      "Wind": 0.0428
     }
   },
   "BR": {
@@ -1668,10 +1668,10 @@
     "2022": {
       "Bioenergy": 0.0127,
       "Coal": 0.011,
-      "Gas": 0.0617,
+      "Gas": 0.062,
       "Hydro": 0.7003,
       "Nuclear": 0.0233,
-      "Other Fossil": 0.0155,
+      "Other Fossil": 0.0151,
       "Other Renewables": 0,
       "Solar": 0.0482,
       "Wind": 0.1272
@@ -1688,15 +1688,15 @@
       "Wind": 0.1416
     },
     "2024": {
-      "Bioenergy": 0.011,
-      "Coal": 0.0086,
-      "Gas": 0.0412,
-      "Hydro": 0.6944,
-      "Nuclear": 0.0233,
+      "Bioenergy": 0.0112,
+      "Coal": 0.009,
+      "Gas": 0.0424,
+      "Hydro": 0.6862,
+      "Nuclear": 0.0239,
       "Other Fossil": 0.0106,
       "Other Renewables": 0,
-      "Solar": 0.096,
-      "Wind": 0.1148
+      "Solar": 0.0971,
+      "Wind": 0.1196
     }
   },
   "BS": {
@@ -2008,10 +2008,10 @@
     "2022": {
       "Bioenergy": 0.1705,
       "Coal": 0.0143,
-      "Gas": 0.1018,
+      "Gas": 0.1019,
       "Hydro": 0.5279,
       "Nuclear": 0.0084,
-      "Other Fossil": 0.1097,
+      "Other Fossil": 0.1096,
       "Other Renewables": 0.0029,
       "Solar": 0.0294,
       "Wind": 0.0351
@@ -2028,15 +2028,15 @@
       "Wind": 0.0381
     },
     "2024": {
-      "Bioenergy": 0.1702,
-      "Coal": 0.0172,
-      "Gas": 0.0919,
-      "Hydro": 0.5295,
+      "Bioenergy": 0.1704,
+      "Coal": 0.0166,
+      "Gas": 0.0947,
+      "Hydro": 0.5259,
       "Nuclear": 0.0097,
-      "Other Fossil": 0.1053,
+      "Other Fossil": 0.1057,
       "Other Renewables": 0.0025,
-      "Solar": 0.041,
-      "Wind": 0.0327
+      "Solar": 0.0403,
+      "Wind": 0.0342
     }
   },
   "CA": {
@@ -2099,12 +2099,12 @@
       "Bioenergy": 0.0157,
       "Coal": 0.0465,
       "Gas": 0.1466,
-      "Hydro": 0.5659,
-      "Nuclear": 0.1253,
+      "Hydro": 0.5657,
+      "Nuclear": 0.1252,
       "Other Fossil": 0.0102,
       "Other Renewables": 0.0005,
-      "Solar": 0.0079,
-      "Wind": 0.0814
+      "Solar": 0.008,
+      "Wind": 0.0816
     }
   },
   "CD": {
@@ -2347,13 +2347,13 @@
     },
     "2022": {
       "Bioenergy": 0.0028,
-      "Coal": 0.0161,
+      "Coal": 0.016,
       "Gas": 0.0248,
       "Hydro": 0.4873,
       "Nuclear": 0.3539,
       "Other Fossil": 0.0545,
       "Other Renewables": 0.0006,
-      "Solar": 0.0458,
+      "Solar": 0.0459,
       "Wind": 0.0142
     },
     "2023": {
@@ -2361,7 +2361,7 @@
       "Coal": 0.0056,
       "Gas": 0.0088,
       "Hydro": 0.5525,
-      "Nuclear": 0.3251,
+      "Nuclear": 0.325,
       "Other Fossil": 0.0501,
       "Other Renewables": 0.0002,
       "Solar": 0.0501,
@@ -2371,12 +2371,12 @@
       "Bioenergy": 0,
       "Coal": 0.0002,
       "Gas": 0.0004,
-      "Hydro": 0.6122,
-      "Nuclear": 0.2748,
-      "Other Fossil": 0.0499,
+      "Hydro": 0.6084,
+      "Nuclear": 0.2813,
+      "Other Fossil": 0.0484,
       "Other Renewables": 0,
-      "Solar": 0.0605,
-      "Wind": 0.0019
+      "Solar": 0.0594,
+      "Wind": 0.0018
     }
   },
   "CI": {
@@ -2572,15 +2572,15 @@
       "Wind": 0.1187
     },
     "2024": {
-      "Bioenergy": 0.0254,
-      "Coal": 0.1844,
-      "Gas": 0.1912,
-      "Hydro": 0.2534,
+      "Bioenergy": 0.0246,
+      "Coal": 0.1747,
+      "Gas": 0.1817,
+      "Hydro": 0.2727,
       "Nuclear": 0,
-      "Other Fossil": 0.0136,
+      "Other Fossil": 0.013,
       "Other Renewables": 0.0044,
-      "Solar": 0.2133,
-      "Wind": 0.1144
+      "Solar": 0.2107,
+      "Wind": 0.1182
     }
   },
   "CM": {
@@ -2844,15 +2844,15 @@
       "Wind": 0.1222
     },
     "2024": {
-      "Bioenergy": 0.0064,
+      "Bioenergy": 0.0065,
       "Coal": 0.0012,
-      "Gas": 0.0067,
-      "Hydro": 0.5222,
+      "Gas": 0.0065,
+      "Hydro": 0.5638,
       "Nuclear": 0.0007,
-      "Other Fossil": 0.2161,
-      "Other Renewables": 0.1188,
-      "Solar": 0.0022,
-      "Wind": 0.1256
+      "Other Fossil": 0.1828,
+      "Other Renewables": 0.1172,
+      "Solar": 0.0021,
+      "Wind": 0.1193
     }
   },
   "CU": {
@@ -3116,15 +3116,15 @@
       "Wind": 0.0105
     },
     "2024": {
-      "Bioenergy": 0.0368,
-      "Coal": 0.337,
-      "Gas": 0.0481,
-      "Hydro": 0.0393,
-      "Nuclear": 0.4169,
-      "Other Fossil": 0.0142,
-      "Other Renewables": 0.037,
-      "Solar": 0.0594,
-      "Wind": 0.0114
+      "Bioenergy": 0.036,
+      "Coal": 0.3356,
+      "Gas": 0.0487,
+      "Hydro": 0.0405,
+      "Nuclear": 0.4167,
+      "Other Fossil": 0.0145,
+      "Other Renewables": 0.0366,
+      "Solar": 0.0603,
+      "Wind": 0.0111
     }
   },
   "DE": {
@@ -3140,21 +3140,21 @@
       "Wind": 0.2147
     },
     "2020": {
-      "Bioenergy": 0.079,
+      "Bioenergy": 0.0791,
       "Coal": 0.2266,
-      "Gas": 0.1701,
-      "Hydro": 0.0355,
-      "Nuclear": 0.1136,
+      "Gas": 0.17,
+      "Hydro": 0.0356,
+      "Nuclear": 0.1135,
       "Other Fossil": 0.0464,
       "Other Renewables": 0,
-      "Solar": 0.0917,
+      "Solar": 0.0916,
       "Wind": 0.2371
     },
     "2021": {
       "Bioenergy": 0.075,
       "Coal": 0.2724,
       "Gas": 0.1581,
-      "Hydro": 0.0362,
+      "Hydro": 0.0361,
       "Nuclear": 0.1189,
       "Other Fossil": 0.0465,
       "Other Renewables": 0,
@@ -3162,37 +3162,37 @@
       "Wind": 0.2021
     },
     "2022": {
-      "Bioenergy": 0.081,
-      "Coal": 0.3059,
-      "Gas": 0.1403,
+      "Bioenergy": 0.0809,
+      "Coal": 0.3058,
+      "Gas": 0.1404,
       "Hydro": 0.0322,
-      "Nuclear": 0.0603,
+      "Nuclear": 0.0604,
       "Other Fossil": 0.0467,
       "Other Renewables": 0,
-      "Solar": 0.1107,
+      "Solar": 0.1106,
       "Wind": 0.2229
     },
     "2023": {
-      "Bioenergy": 0.0845,
-      "Coal": 0.2467,
-      "Gas": 0.1545,
-      "Hydro": 0.0463,
-      "Nuclear": 0.0217,
-      "Other Fossil": 0.0487,
+      "Bioenergy": 0.0841,
+      "Coal": 0.2455,
+      "Gas": 0.1585,
+      "Hydro": 0.0461,
+      "Nuclear": 0.0216,
+      "Other Fossil": 0.0484,
       "Other Renewables": 0.0003,
-      "Solar": 0.1251,
-      "Wind": 0.2722
+      "Solar": 0.1245,
+      "Wind": 0.2709
     },
     "2024": {
-      "Bioenergy": 0.0904,
-      "Coal": 0.1941,
-      "Gas": 0.1676,
+      "Bioenergy": 0.0886,
+      "Coal": 0.1952,
+      "Gas": 0.1735,
       "Hydro": 0.0554,
-      "Nuclear": 0.0079,
-      "Other Fossil": 0.0428,
+      "Nuclear": 0.0084,
+      "Other Fossil": 0.0416,
       "Other Renewables": 0.0003,
-      "Solar": 0.1494,
-      "Wind": 0.2922
+      "Solar": 0.1486,
+      "Wind": 0.2883
     }
   },
   "DJ": {
@@ -3320,15 +3320,15 @@
       "Wind": 0.5468
     },
     "2024": {
-      "Bioenergy": 0.1138,
-      "Coal": 0.0924,
-      "Gas": 0.0651,
-      "Hydro": 0.0127,
-      "Nuclear": 0.0116,
-      "Other Fossil": 0.0326,
+      "Bioenergy": 0.1062,
+      "Coal": 0.0959,
+      "Gas": 0.065,
+      "Hydro": 0.0134,
+      "Nuclear": 0.0123,
+      "Other Fossil": 0.0328,
       "Other Renewables": 0.0004,
-      "Solar": 0.1083,
-      "Wind": 0.5632
+      "Solar": 0.1059,
+      "Wind": 0.568
     }
   },
   "DM": {
@@ -3593,14 +3593,14 @@
     },
     "2024": {
       "Bioenergy": 0.0008,
-      "Coal": 0.0013,
-      "Gas": 0.0335,
-      "Hydro": 0.7133,
+      "Coal": 0.0012,
+      "Gas": 0.0337,
+      "Hydro": 0.7129,
       "Nuclear": 0.0007,
-      "Other Fossil": 0.2406,
+      "Other Fossil": 0.2407,
       "Other Renewables": 0.0002,
-      "Solar": 0.0022,
-      "Wind": 0.0076
+      "Solar": 0.0021,
+      "Wind": 0.0078
     }
   },
   "EE": {
@@ -3651,24 +3651,24 @@
     "2023": {
       "Bioenergy": 0.0748,
       "Coal": 0.0612,
-      "Gas": 0.1003,
-      "Hydro": 0.0707,
-      "Nuclear": 0.0823,
-      "Other Fossil": 0.3373,
+      "Gas": 0.1004,
+      "Hydro": 0.0706,
+      "Nuclear": 0.0822,
+      "Other Fossil": 0.3372,
       "Other Renewables": 0.0027,
       "Solar": 0.1151,
-      "Wind": 0.1557
+      "Wind": 0.1556
     },
     "2024": {
-      "Bioenergy": 0.071,
-      "Coal": 0.0501,
-      "Gas": 0.0873,
-      "Hydro": 0.0735,
-      "Nuclear": 0.0754,
-      "Other Fossil": 0.3263,
-      "Other Renewables": 0.0025,
-      "Solar": 0.1398,
-      "Wind": 0.174
+      "Bioenergy": 0.0714,
+      "Coal": 0.0499,
+      "Gas": 0.0868,
+      "Hydro": 0.0724,
+      "Nuclear": 0.0745,
+      "Other Fossil": 0.332,
+      "Other Renewables": 0.0024,
+      "Solar": 0.1355,
+      "Wind": 0.1751
     }
   },
   "EG": {
@@ -3864,15 +3864,15 @@
       "Wind": 0.249
     },
     "2024": {
-      "Bioenergy": 0.0138,
-      "Coal": 0.0114,
-      "Gas": 0.1418,
-      "Hydro": 0.1695,
-      "Nuclear": 0.1987,
-      "Other Fossil": 0.0095,
-      "Other Renewables": 0.0029,
-      "Solar": 0.193,
-      "Wind": 0.2594
+      "Bioenergy": 0.0139,
+      "Coal": 0.0111,
+      "Gas": 0.1434,
+      "Hydro": 0.1643,
+      "Nuclear": 0.2054,
+      "Other Fossil": 0.0097,
+      "Other Renewables": 0.0028,
+      "Solar": 0.1887,
+      "Wind": 0.2606
     }
   },
   "ET": {
@@ -3964,7 +3964,7 @@
       "Other Fossil": 0.0479,
       "Other Renewables": 0.0038,
       "Solar": 0.0108,
-      "Wind": 0.1089
+      "Wind": 0.109
     },
     "2021": {
       "Bioenergy": 0.1401,
@@ -3996,19 +3996,19 @@
       "Nuclear": 0.4098,
       "Other Fossil": 0.0383,
       "Other Renewables": 0.0002,
-      "Solar": 0.0088,
+      "Solar": 0.0089,
       "Wind": 0.1777
     },
     "2024": {
-      "Bioenergy": 0.1208,
-      "Coal": 0.0315,
-      "Gas": 0.0309,
-      "Hydro": 0.2067,
-      "Nuclear": 0.3402,
-      "Other Fossil": 0.0473,
-      "Other Renewables": 0.0006,
-      "Solar": 0.0139,
-      "Wind": 0.2081
+      "Bioenergy": 0.1191,
+      "Coal": 0.0294,
+      "Gas": 0.0288,
+      "Hydro": 0.1979,
+      "Nuclear": 0.3568,
+      "Other Fossil": 0.047,
+      "Other Renewables": 0.0005,
+      "Solar": 0.015,
+      "Wind": 0.2054
     }
   },
   "FJ": {
@@ -4252,7 +4252,7 @@
     "2022": {
       "Bioenergy": 0.0092,
       "Coal": 0.0141,
-      "Gas": 0.1059,
+      "Gas": 0.106,
       "Hydro": 0.1027,
       "Nuclear": 0.6301,
       "Other Fossil": 0.0081,
@@ -4274,12 +4274,12 @@
     "2024": {
       "Bioenergy": 0.0059,
       "Coal": 0.0009,
-      "Gas": 0.0372,
-      "Hydro": 0.1377,
-      "Nuclear": 0.6763,
-      "Other Fossil": 0.0057,
+      "Gas": 0.0376,
+      "Hydro": 0.136,
+      "Nuclear": 0.6764,
+      "Other Fossil": 0.0058,
       "Other Renewables": 0,
-      "Solar": 0.0413,
+      "Solar": 0.0426,
       "Wind": 0.0949
     }
   },
@@ -4408,15 +4408,15 @@
       "Wind": 0.314
     },
     "2024": {
-      "Bioenergy": 0.0728,
-      "Coal": 0.0289,
-      "Gas": 0.3037,
-      "Hydro": 0.0438,
-      "Nuclear": 0.1695,
-      "Other Fossil": 0.0137,
-      "Other Renewables": 0.001,
-      "Solar": 0.0619,
-      "Wind": 0.3048
+      "Bioenergy": 0.0707,
+      "Coal": 0.0275,
+      "Gas": 0.2928,
+      "Hydro": 0.0416,
+      "Nuclear": 0.1656,
+      "Other Fossil": 0.0138,
+      "Other Renewables": 0.0009,
+      "Solar": 0.0632,
+      "Wind": 0.3239
     }
   },
   "GD": {
@@ -4545,14 +4545,14 @@
     },
     "2024": {
       "Bioenergy": 0.0012,
-      "Coal": 0.036,
-      "Gas": 0.2063,
-      "Hydro": 0.7351,
-      "Nuclear": 0.0032,
+      "Coal": 0.0352,
+      "Gas": 0.1831,
+      "Hydro": 0.76,
+      "Nuclear": 0.0031,
       "Other Fossil": 0.0004,
       "Other Renewables": 0.0003,
-      "Solar": 0.004,
-      "Wind": 0.0135
+      "Solar": 0.0039,
+      "Wind": 0.0127
     }
   },
   "GF": {
@@ -5115,7 +5115,7 @@
       "Bioenergy": 0.0055,
       "Coal": 0.1502,
       "Gas": 0.4454,
-      "Hydro": 0.0858,
+      "Hydro": 0.0859,
       "Nuclear": 0.0403,
       "Other Fossil": 0.0038,
       "Other Renewables": 0.0012,
@@ -5141,14 +5141,14 @@
       "Nuclear": 0.0186,
       "Other Fossil": 0.0019,
       "Other Renewables": 0.0006,
-      "Solar": 0.1231,
+      "Solar": 0.1232,
       "Wind": 0.2103
     },
     "2023": {
       "Bioenergy": 0.0031,
       "Coal": 0.116,
-      "Gas": 0.3655,
-      "Hydro": 0.0929,
+      "Gas": 0.3656,
+      "Hydro": 0.0928,
       "Nuclear": 0.0221,
       "Other Fossil": 0.0022,
       "Other Renewables": 0.0007,
@@ -5156,15 +5156,15 @@
       "Wind": 0.2195
     },
     "2024": {
-      "Bioenergy": 0.0008,
-      "Coal": 0.0661,
-      "Gas": 0.4001,
-      "Hydro": 0.0639,
-      "Nuclear": 0.0055,
-      "Other Fossil": 0.0005,
+      "Bioenergy": 0.001,
+      "Coal": 0.0695,
+      "Gas": 0.3974,
+      "Hydro": 0.0671,
+      "Nuclear": 0.0067,
+      "Other Fossil": 0.0006,
       "Other Renewables": 0.0002,
-      "Solar": 0.2201,
-      "Wind": 0.2428
+      "Solar": 0.2199,
+      "Wind": 0.2376
     }
   },
   "GT": {
@@ -5496,15 +5496,15 @@
       "Wind": 0.0176
     },
     "2024": {
-      "Bioenergy": 0.0076,
-      "Coal": 0.5693,
-      "Gas": 0.3404,
-      "Hydro": 0.0233,
-      "Nuclear": 0.0135,
+      "Bioenergy": 0.0075,
+      "Coal": 0.5669,
+      "Gas": 0.3402,
+      "Hydro": 0.0258,
+      "Nuclear": 0.0133,
       "Other Fossil": 0.0051,
       "Other Renewables": 0.0013,
-      "Solar": 0.0187,
-      "Wind": 0.0208
+      "Solar": 0.0194,
+      "Wind": 0.0204
     }
   },
   "HN": {
@@ -5566,13 +5566,13 @@
     "2024": {
       "Bioenergy": 0.1288,
       "Coal": 0.0009,
-      "Gas": 0.0048,
-      "Hydro": 0.2249,
+      "Gas": 0.0049,
+      "Hydro": 0.2247,
       "Nuclear": 0.0005,
       "Other Fossil": 0.4393,
       "Other Renewables": 0.0265,
       "Solar": 0.1002,
-      "Wind": 0.074
+      "Wind": 0.0741
     }
   },
   "HR": {
@@ -5591,7 +5591,7 @@
       "Bioenergy": 0.0377,
       "Coal": 0.1105,
       "Gas": 0.2531,
-      "Hydro": 0.3434,
+      "Hydro": 0.3435,
       "Nuclear": 0.0649,
       "Other Fossil": 0.0086,
       "Other Renewables": 0.0308,
@@ -5610,7 +5610,7 @@
       "Wind": 0.138
     },
     "2022": {
-      "Bioenergy": 0.0449,
+      "Bioenergy": 0.045,
       "Coal": 0.1286,
       "Gas": 0.2557,
       "Hydro": 0.2986,
@@ -5628,19 +5628,19 @@
       "Nuclear": 0.0297,
       "Other Fossil": 0.009,
       "Other Renewables": 0.0156,
-      "Solar": 0.0169,
+      "Solar": 0.0168,
       "Wind": 0.1603
     },
     "2024": {
-      "Bioenergy": 0.044,
-      "Coal": 0.0278,
-      "Gas": 0.2263,
-      "Hydro": 0.4124,
-      "Nuclear": 0.0451,
-      "Other Fossil": 0.0114,
-      "Other Renewables": 0.0159,
-      "Solar": 0.0294,
-      "Wind": 0.1877
+      "Bioenergy": 0.0438,
+      "Coal": 0.0303,
+      "Gas": 0.221,
+      "Hydro": 0.4183,
+      "Nuclear": 0.0484,
+      "Other Fossil": 0.0116,
+      "Other Renewables": 0.0158,
+      "Solar": 0.032,
+      "Wind": 0.1788
     }
   },
   "HT": {
@@ -5727,12 +5727,12 @@
       "Bioenergy": 0.0312,
       "Coal": 0.1262,
       "Gas": 0.2517,
-      "Hydro": 0.0537,
+      "Hydro": 0.0538,
       "Nuclear": 0.4039,
       "Other Fossil": 0.0215,
       "Other Renewables": 0.0045,
       "Solar": 0.0637,
-      "Wind": 0.0435
+      "Wind": 0.0436
     },
     "2021": {
       "Bioenergy": 0.0326,
@@ -5757,162 +5757,162 @@
       "Wind": 0.0445
     },
     "2023": {
-      "Bioenergy": 0.0241,
-      "Coal": 0.099,
+      "Bioenergy": 0.024,
+      "Coal": 0.0989,
       "Gas": 0.2095,
       "Hydro": 0.0479,
       "Nuclear": 0.3906,
       "Other Fossil": 0.0192,
-      "Other Renewables": 0.0028,
+      "Other Renewables": 0.0027,
       "Solar": 0.1596,
       "Wind": 0.0474
     },
     "2024": {
-      "Bioenergy": 0.027,
-      "Coal": 0.0932,
-      "Gas": 0.1932,
-      "Hydro": 0.0532,
-      "Nuclear": 0.3794,
-      "Other Fossil": 0.0194,
-      "Other Renewables": 0.0039,
-      "Solar": 0.1784,
-      "Wind": 0.0522
+      "Bioenergy": 0.0261,
+      "Coal": 0.0897,
+      "Gas": 0.1827,
+      "Hydro": 0.0502,
+      "Nuclear": 0.3664,
+      "Other Fossil": 0.0184,
+      "Other Renewables": 0.0037,
+      "Solar": 0.2133,
+      "Wind": 0.0494
     }
   },
   "ID": {
     "2019": {
-      "Bioenergy": 0.0411,
+      "Bioenergy": 0.0412,
       "Coal": 0.5906,
-      "Gas": 0.2104,
-      "Hydro": 0.072,
-      "Nuclear": 0.0003,
-      "Other Fossil": 0.0357,
-      "Other Renewables": 0.0476,
-      "Solar": 0.0006,
-      "Wind": 0.0018
+      "Gas": 0.2109,
+      "Hydro": 0.0716,
+      "Nuclear": 0,
+      "Other Fossil": 0.0358,
+      "Other Renewables": 0.0478,
+      "Solar": 0.0004,
+      "Wind": 0.0016
     },
     "2020": {
-      "Bioenergy": 0.0411,
-      "Coal": 0.5905,
-      "Gas": 0.2104,
-      "Hydro": 0.072,
-      "Nuclear": 0.0003,
-      "Other Fossil": 0.0356,
-      "Other Renewables": 0.0476,
-      "Solar": 0.0006,
-      "Wind": 0.0018
+      "Bioenergy": 0.0412,
+      "Coal": 0.5906,
+      "Gas": 0.2109,
+      "Hydro": 0.0716,
+      "Nuclear": 0,
+      "Other Fossil": 0.0358,
+      "Other Renewables": 0.0478,
+      "Solar": 0.0004,
+      "Wind": 0.0016
     },
     "2021": {
-      "Bioenergy": 0.0411,
-      "Coal": 0.5905,
-      "Gas": 0.2103,
-      "Hydro": 0.0719,
-      "Nuclear": 0.0003,
-      "Other Fossil": 0.0357,
-      "Other Renewables": 0.0476,
-      "Solar": 0.0006,
-      "Wind": 0.0019
+      "Bioenergy": 0.0412,
+      "Coal": 0.5906,
+      "Gas": 0.2109,
+      "Hydro": 0.0716,
+      "Nuclear": 0,
+      "Other Fossil": 0.0358,
+      "Other Renewables": 0.0478,
+      "Solar": 0.0004,
+      "Wind": 0.0016
     },
     "2022": {
-      "Bioenergy": 0.0411,
-      "Coal": 0.5904,
-      "Gas": 0.2103,
-      "Hydro": 0.0719,
-      "Nuclear": 0.0003,
-      "Other Fossil": 0.0357,
-      "Other Renewables": 0.0476,
-      "Solar": 0.0007,
-      "Wind": 0.0019
+      "Bioenergy": 0.0412,
+      "Coal": 0.5906,
+      "Gas": 0.2109,
+      "Hydro": 0.0716,
+      "Nuclear": 0,
+      "Other Fossil": 0.0358,
+      "Other Renewables": 0.0478,
+      "Solar": 0.0004,
+      "Wind": 0.0016
     },
     "2023": {
-      "Bioenergy": 0.0411,
-      "Coal": 0.5905,
-      "Gas": 0.2103,
-      "Hydro": 0.0718,
-      "Nuclear": 0.0003,
-      "Other Fossil": 0.0356,
-      "Other Renewables": 0.0476,
-      "Solar": 0.0007,
-      "Wind": 0.002
+      "Bioenergy": 0.0412,
+      "Coal": 0.5906,
+      "Gas": 0.2109,
+      "Hydro": 0.0716,
+      "Nuclear": 0,
+      "Other Fossil": 0.0358,
+      "Other Renewables": 0.0478,
+      "Solar": 0.0004,
+      "Wind": 0.0016
     },
     "2024": {
-      "Bioenergy": 0.0411,
-      "Coal": 0.5905,
-      "Gas": 0.2103,
-      "Hydro": 0.0717,
-      "Nuclear": 0.0003,
-      "Other Fossil": 0.0356,
-      "Other Renewables": 0.0476,
-      "Solar": 0.0008,
-      "Wind": 0.0021
+      "Bioenergy": 0.0412,
+      "Coal": 0.5906,
+      "Gas": 0.2109,
+      "Hydro": 0.0716,
+      "Nuclear": 0,
+      "Other Fossil": 0.0358,
+      "Other Renewables": 0.0478,
+      "Solar": 0.0004,
+      "Wind": 0.0016
     }
   },
   "IE": {
     "2019": {
-      "Bioenergy": 0.0083,
-      "Coal": 0.0233,
-      "Gas": 0.5001,
-      "Hydro": 0.0336,
-      "Nuclear": 0.0054,
-      "Other Fossil": 0.0936,
-      "Other Renewables": 0.0001,
-      "Solar": 0.0008,
-      "Wind": 0.3348
+      "Bioenergy": 0.0089,
+      "Coal": 0.0362,
+      "Gas": 0.4793,
+      "Hydro": 0.0454,
+      "Nuclear": 0.0257,
+      "Other Fossil": 0.0867,
+      "Other Renewables": 0.0007,
+      "Solar": 0.0034,
+      "Wind": 0.3138
     },
     "2020": {
-      "Bioenergy": 0.0061,
-      "Coal": 0.026,
-      "Gas": 0.4916,
-      "Hydro": 0.032,
-      "Nuclear": 0.0021,
-      "Other Fossil": 0.0667,
-      "Other Renewables": 0.0001,
-      "Solar": 0.0004,
-      "Wind": 0.3751
+      "Bioenergy": 0.0076,
+      "Coal": 0.0381,
+      "Gas": 0.4697,
+      "Hydro": 0.0466,
+      "Nuclear": 0.0234,
+      "Other Fossil": 0.0607,
+      "Other Renewables": 0.0007,
+      "Solar": 0.004,
+      "Wind": 0.3492
     },
     "2021": {
-      "Bioenergy": 0.0054,
-      "Coal": 0.0961,
-      "Gas": 0.4579,
-      "Hydro": 0.0332,
-      "Nuclear": 0.0119,
-      "Other Fossil": 0.0785,
-      "Other Renewables": 0.0004,
-      "Solar": 0.003,
-      "Wind": 0.3136
+      "Bioenergy": 0.0066,
+      "Coal": 0.0992,
+      "Gas": 0.4478,
+      "Hydro": 0.0397,
+      "Nuclear": 0.022,
+      "Other Fossil": 0.0757,
+      "Other Renewables": 0.0006,
+      "Solar": 0.0043,
+      "Wind": 0.304
     },
     "2022": {
-      "Bioenergy": 0.0042,
-      "Coal": 0.0807,
-      "Gas": 0.48,
-      "Hydro": 0.0237,
-      "Nuclear": 0.0029,
-      "Other Fossil": 0.0613,
-      "Other Renewables": 0.0001,
-      "Solar": 0.0009,
-      "Wind": 0.3463
+      "Bioenergy": 0.006,
+      "Coal": 0.0869,
+      "Gas": 0.4647,
+      "Hydro": 0.0325,
+      "Nuclear": 0.0163,
+      "Other Fossil": 0.0582,
+      "Other Renewables": 0.0005,
+      "Solar": 0.0042,
+      "Wind": 0.3307
     },
     "2023": {
-      "Bioenergy": 0.0063,
-      "Coal": 0.0516,
-      "Gas": 0.4564,
-      "Hydro": 0.0456,
-      "Nuclear": 0.0197,
-      "Other Fossil": 0.0363,
-      "Other Renewables": 0.0006,
-      "Solar": 0.0179,
-      "Wind": 0.3655
+      "Bioenergy": 0.0069,
+      "Coal": 0.054,
+      "Gas": 0.4511,
+      "Hydro": 0.0486,
+      "Nuclear": 0.0245,
+      "Other Fossil": 0.0359,
+      "Other Renewables": 0.0008,
+      "Solar": 0.0188,
+      "Wind": 0.3594
     },
     "2024": {
-      "Bioenergy": 0.0074,
-      "Coal": 0.0465,
-      "Gas": 0.4049,
-      "Hydro": 0.0629,
-      "Nuclear": 0.0262,
-      "Other Fossil": 0.038,
-      "Other Renewables": 0.0009,
-      "Solar": 0.0248,
-      "Wind": 0.3884
+      "Bioenergy": 0.0078,
+      "Coal": 0.042,
+      "Gas": 0.4408,
+      "Hydro": 0.0594,
+      "Nuclear": 0.0297,
+      "Other Fossil": 0.0418,
+      "Other Renewables": 0.001,
+      "Solar": 0.0293,
+      "Wind": 0.3481
     }
   },
   "IL": {
@@ -6040,15 +6040,15 @@
       "Wind": 0.0482
     },
     "2024": {
-      "Bioenergy": 0.0103,
-      "Coal": 0.7802,
-      "Gas": 0.0207,
-      "Hydro": 0.0523,
-      "Nuclear": 0.028,
-      "Other Fossil": 0.0003,
+      "Bioenergy": 0.009,
+      "Coal": 0.7648,
+      "Gas": 0.0233,
+      "Hydro": 0.061,
+      "Nuclear": 0.0272,
+      "Other Fossil": 0.0002,
       "Other Renewables": 0.0016,
-      "Solar": 0.0757,
-      "Wind": 0.031
+      "Solar": 0.075,
+      "Wind": 0.0379
     }
   },
   "IQ": {
@@ -6312,15 +6312,15 @@
       "Wind": 0.1016
     },
     "2024": {
-      "Bioenergy": 0.0597,
-      "Coal": 0.0382,
-      "Gas": 0.3601,
-      "Hydro": 0.1991,
-      "Nuclear": 0.0385,
-      "Other Fossil": 0.0331,
-      "Other Renewables": 0.0199,
-      "Solar": 0.1343,
-      "Wind": 0.117
+      "Bioenergy": 0.059,
+      "Coal": 0.0375,
+      "Gas": 0.3656,
+      "Hydro": 0.2004,
+      "Nuclear": 0.037,
+      "Other Fossil": 0.0332,
+      "Other Renewables": 0.0197,
+      "Solar": 0.1341,
+      "Wind": 0.1135
     }
   },
   "JM": {
@@ -6720,15 +6720,15 @@
       "Wind": 0.0181
     },
     "2024": {
-      "Bioenergy": 0.0133,
-      "Coal": 0.4765,
-      "Gas": 0.026,
-      "Hydro": 0.3628,
-      "Nuclear": 0.0138,
+      "Bioenergy": 0.0132,
+      "Coal": 0.474,
+      "Gas": 0.0258,
+      "Hydro": 0.3654,
+      "Nuclear": 0.0136,
       "Other Fossil": 0.0562,
       "Other Renewables": 0.0013,
-      "Solar": 0.0288,
-      "Wind": 0.0213
+      "Solar": 0.0296,
+      "Wind": 0.0209
     }
   },
   "KI": {
@@ -7700,14 +7700,14 @@
       "Coal": 0.0996,
       "Gas": 0.2934,
       "Hydro": 0.1416,
-      "Nuclear": 0.145,
+      "Nuclear": 0.1451,
       "Other Fossil": 0.0375,
       "Other Renewables": 0.0044,
       "Solar": 0.03,
-      "Wind": 0.1952
+      "Wind": 0.1953
     },
     "2021": {
-      "Bioenergy": 0.0534,
+      "Bioenergy": 0.0533,
       "Coal": 0.1132,
       "Gas": 0.2759,
       "Hydro": 0.1489,
@@ -7723,40 +7723,40 @@
       "Gas": 0.2272,
       "Hydro": 0.1433,
       "Nuclear": 0.1415,
-      "Other Fossil": 0.0465,
+      "Other Fossil": 0.0464,
       "Other Renewables": 0.0047,
       "Solar": 0.0635,
       "Wind": 0.2017
     },
     "2023": {
       "Bioenergy": 0.0386,
-      "Coal": 0.089,
-      "Gas": 0.1963,
-      "Hydro": 0.1354,
+      "Coal": 0.0889,
+      "Gas": 0.1965,
+      "Hydro": 0.1353,
       "Nuclear": 0.1198,
-      "Other Fossil": 0.0571,
+      "Other Fossil": 0.057,
       "Other Renewables": 0.0039,
-      "Solar": 0.088,
+      "Solar": 0.0881,
       "Wind": 0.2719
     },
     "2024": {
-      "Bioenergy": 0.0321,
-      "Coal": 0.0588,
-      "Gas": 0.1557,
-      "Hydro": 0.1292,
-      "Nuclear": 0.0897,
-      "Other Fossil": 0.0739,
+      "Bioenergy": 0.0319,
+      "Coal": 0.0592,
+      "Gas": 0.1611,
+      "Hydro": 0.1276,
+      "Nuclear": 0.0894,
+      "Other Fossil": 0.0729,
       "Other Renewables": 0.0029,
-      "Solar": 0.1366,
-      "Wind": 0.321
+      "Solar": 0.1394,
+      "Wind": 0.3156
     }
   },
   "LU": {
     "2019": {
-      "Bioenergy": 0.0572,
+      "Bioenergy": 0.0571,
       "Coal": 0.1335,
       "Gas": 0.2563,
-      "Hydro": 0.1485,
+      "Hydro": 0.1486,
       "Nuclear": 0.1816,
       "Other Fossil": 0.0402,
       "Other Renewables": 0.0049,
@@ -7779,10 +7779,10 @@
       "Coal": 0.1193,
       "Gas": 0.2394,
       "Hydro": 0.1481,
-      "Nuclear": 0.1688,
+      "Nuclear": 0.1689,
       "Other Fossil": 0.0371,
       "Other Renewables": 0.0049,
-      "Solar": 0.0652,
+      "Solar": 0.0653,
       "Wind": 0.1376
     },
     "2022": {
@@ -7797,26 +7797,26 @@
       "Wind": 0.1489
     },
     "2023": {
-      "Bioenergy": 0.0551,
-      "Coal": 0.1109,
-      "Gas": 0.1997,
+      "Bioenergy": 0.055,
+      "Coal": 0.1108,
+      "Gas": 0.1999,
       "Hydro": 0.1447,
       "Nuclear": 0.1501,
       "Other Fossil": 0.0361,
       "Other Renewables": 0.0049,
       "Solar": 0.0977,
-      "Wind": 0.2008
+      "Wind": 0.2007
     },
     "2024": {
-      "Bioenergy": 0.0582,
-      "Coal": 0.093,
-      "Gas": 0.1789,
-      "Hydro": 0.1687,
-      "Nuclear": 0.144,
-      "Other Fossil": 0.038,
-      "Other Renewables": 0.0048,
-      "Solar": 0.1112,
-      "Wind": 0.2032
+      "Bioenergy": 0.058,
+      "Coal": 0.0939,
+      "Gas": 0.1796,
+      "Hydro": 0.1684,
+      "Nuclear": 0.1437,
+      "Other Fossil": 0.0382,
+      "Other Renewables": 0.0047,
+      "Solar": 0.1126,
+      "Wind": 0.2008
     }
   },
   "LV": {
@@ -7844,7 +7844,7 @@
     },
     "2021": {
       "Bioenergy": 0.0761,
-      "Coal": 0.0411,
+      "Coal": 0.0412,
       "Gas": 0.3109,
       "Hydro": 0.3885,
       "Nuclear": 0.0578,
@@ -7858,33 +7858,33 @@
       "Coal": 0.0583,
       "Gas": 0.2518,
       "Hydro": 0.4339,
-      "Nuclear": 0.0681,
+      "Nuclear": 0.0682,
       "Other Fossil": 0.0447,
       "Other Renewables": 0.0023,
-      "Solar": 0.02,
+      "Solar": 0.0199,
       "Wind": 0.0627
     },
     "2023": {
       "Bioenergy": 0.0374,
       "Coal": 0.0396,
-      "Gas": 0.2537,
+      "Gas": 0.2539,
       "Hydro": 0.4973,
-      "Nuclear": 0.0576,
+      "Nuclear": 0.0577,
       "Other Fossil": 0.0243,
       "Other Renewables": 0.0019,
-      "Solar": 0.023,
+      "Solar": 0.0229,
       "Wind": 0.065
     },
     "2024": {
-      "Bioenergy": 0.0313,
-      "Coal": 0.0035,
-      "Gas": 0.2269,
-      "Hydro": 0.6832,
-      "Nuclear": 0.0061,
-      "Other Fossil": 0.0157,
-      "Other Renewables": 0.0002,
-      "Solar": 0.0034,
-      "Wind": 0.0297
+      "Bioenergy": 0.0332,
+      "Coal": 0.012,
+      "Gas": 0.2418,
+      "Hydro": 0.623,
+      "Nuclear": 0.0201,
+      "Other Fossil": 0.017,
+      "Other Renewables": 0.0007,
+      "Solar": 0.015,
+      "Wind": 0.0372
     }
   },
   "LY": {
@@ -8065,7 +8065,7 @@
       "Nuclear": 0.0309,
       "Other Fossil": 0.0033,
       "Other Renewables": 0.001,
-      "Solar": 0.0078,
+      "Solar": 0.0077,
       "Wind": 0.0183
     },
     "2023": {
@@ -8080,15 +8080,15 @@
       "Wind": 0.0094
     },
     "2024": {
-      "Bioenergy": 0.001,
-      "Coal": 0.0051,
-      "Gas": 0.9087,
-      "Hydro": 0.0492,
-      "Nuclear": 0.0071,
-      "Other Fossil": 0.0007,
+      "Bioenergy": 0.0011,
+      "Coal": 0.0055,
+      "Gas": 0.9095,
+      "Hydro": 0.0499,
+      "Nuclear": 0.0078,
+      "Other Fossil": 0.0008,
       "Other Renewables": 0.0002,
-      "Solar": 0.001,
-      "Wind": 0.027
+      "Solar": 0.0015,
+      "Wind": 0.0238
     }
   },
   "ME": {
@@ -8148,15 +8148,15 @@
       "Wind": 0.0889
     },
     "2024": {
-      "Bioenergy": 0.0021,
-      "Coal": 0.2841,
-      "Gas": 0.0135,
-      "Hydro": 0.5595,
-      "Nuclear": 0.0134,
-      "Other Fossil": 0.0012,
-      "Other Renewables": 0.0005,
-      "Solar": 0.0074,
-      "Wind": 0.1183
+      "Bioenergy": 0.0028,
+      "Coal": 0.3086,
+      "Gas": 0.0199,
+      "Hydro": 0.5314,
+      "Nuclear": 0.0196,
+      "Other Fossil": 0.0018,
+      "Other Renewables": 0.0006,
+      "Solar": 0.0115,
+      "Wind": 0.1039
     }
   },
   "MG": {
@@ -8284,15 +8284,15 @@
       "Wind": 0.0285
     },
     "2024": {
-      "Bioenergy": 0.0011,
-      "Coal": 0.4304,
-      "Gas": 0.2059,
-      "Hydro": 0.2722,
-      "Nuclear": 0.0082,
-      "Other Fossil": 0.0008,
-      "Other Renewables": 0.0002,
-      "Solar": 0.0346,
-      "Wind": 0.0466
+      "Bioenergy": 0.0165,
+      "Coal": 0.4363,
+      "Gas": 0.1759,
+      "Hydro": 0.2641,
+      "Nuclear": 0.0203,
+      "Other Fossil": 0.0019,
+      "Other Renewables": 0.0006,
+      "Solar": 0.0411,
+      "Wind": 0.0432
     }
   },
   "ML": {
@@ -8489,14 +8489,14 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Coal": 0.9077,
+      "Coal": 0.9044,
       "Gas": 0,
       "Hydro": 0,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
       "Solar": 0,
-      "Wind": 0.0923
+      "Wind": 0.0956
     }
   },
   "MO": {
@@ -8556,15 +8556,15 @@
       "Wind": 0.0601
     },
     "2024": {
-      "Bioenergy": 0.0541,
-      "Coal": 0.4851,
-      "Gas": 0.1637,
-      "Hydro": 0.0794,
-      "Nuclear": 0.0458,
+      "Bioenergy": 0.0538,
+      "Coal": 0.477,
+      "Gas": 0.163,
+      "Hydro": 0.088,
+      "Nuclear": 0.0454,
       "Other Fossil": 0.0342,
       "Other Renewables": 0.0043,
-      "Solar": 0.0623,
-      "Wind": 0.071
+      "Solar": 0.0649,
+      "Wind": 0.0695
     }
   },
   "MQ": {
@@ -8808,7 +8808,7 @@
     "2022": {
       "Bioenergy": 0.0073,
       "Coal": 0.0405,
-      "Gas": 0.7739,
+      "Gas": 0.774,
       "Hydro": 0.0378,
       "Nuclear": 0.048,
       "Other Fossil": 0.0238,
@@ -8819,7 +8819,7 @@
     "2023": {
       "Bioenergy": 0.006,
       "Coal": 0.0321,
-      "Gas": 0.7208,
+      "Gas": 0.7209,
       "Hydro": 0.0376,
       "Nuclear": 0.0437,
       "Other Fossil": 0.0111,
@@ -8828,15 +8828,15 @@
       "Wind": 0.0283
     },
     "2024": {
-      "Bioenergy": 0.0088,
-      "Coal": 0.0374,
+      "Bioenergy": 0.0085,
+      "Coal": 0.0377,
       "Gas": 0.6456,
-      "Hydro": 0.0594,
-      "Nuclear": 0.0588,
+      "Hydro": 0.059,
+      "Nuclear": 0.0585,
       "Other Fossil": 0.0055,
-      "Other Renewables": 0.002,
-      "Solar": 0.1436,
-      "Wind": 0.039
+      "Other Renewables": 0.0019,
+      "Solar": 0.1441,
+      "Wind": 0.0392
     }
   },
   "MU": {
@@ -9577,14 +9577,14 @@
     },
     "2024": {
       "Bioenergy": 0.1684,
-      "Coal": 0.0035,
-      "Gas": 0.0187,
-      "Hydro": 0.088,
+      "Coal": 0.0034,
+      "Gas": 0.0193,
+      "Hydro": 0.0873,
       "Nuclear": 0.002,
-      "Other Fossil": 0.3988,
+      "Other Fossil": 0.3989,
       "Other Renewables": 0.1562,
-      "Solar": 0.0121,
-      "Wind": 0.1524
+      "Solar": 0.012,
+      "Wind": 0.1527
     }
   },
   "NL": {
@@ -9644,15 +9644,15 @@
       "Wind": 0.2525
     },
     "2024": {
-      "Bioenergy": 0.0615,
-      "Coal": 0.0528,
-      "Gas": 0.3656,
-      "Hydro": 0.0063,
-      "Nuclear": 0.0226,
-      "Other Fossil": 0.0122,
-      "Other Renewables": 0.004,
-      "Solar": 0.1919,
-      "Wind": 0.2832
+      "Bioenergy": 0.0459,
+      "Coal": 0.0639,
+      "Gas": 0.3573,
+      "Hydro": 0.0039,
+      "Nuclear": 0.0236,
+      "Other Fossil": 0.0116,
+      "Other Renewables": 0.0037,
+      "Solar": 0.2014,
+      "Wind": 0.2888
     }
   },
   "NO": {
@@ -9693,7 +9693,7 @@
       "Bioenergy": 0.0002,
       "Coal": 0.001,
       "Gas": 0.0101,
-      "Hydro": 0.8789,
+      "Hydro": 0.879,
       "Nuclear": 0.0011,
       "Other Fossil": 0.0018,
       "Other Renewables": 0.0027,
@@ -9714,13 +9714,13 @@
     "2024": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.0109,
-      "Hydro": 0.8917,
+      "Gas": 0.0107,
+      "Hydro": 0.8893,
       "Nuclear": 0,
-      "Other Fossil": 0.0019,
-      "Other Renewables": 0.0027,
+      "Other Fossil": 0.0018,
+      "Other Renewables": 0.0028,
       "Solar": 0,
-      "Wind": 0.0929
+      "Wind": 0.0953
     }
   },
   "NP": {
@@ -9780,15 +9780,15 @@
       "Wind": 0.0159
     },
     "2024": {
-      "Bioenergy": 0.004,
-      "Coal": 0.1184,
-      "Gas": 0.0211,
-      "Hydro": 0.8003,
-      "Nuclear": 0.0112,
+      "Bioenergy": 0.0039,
+      "Coal": 0.1164,
+      "Gas": 0.0209,
+      "Hydro": 0.8024,
+      "Nuclear": 0.0111,
       "Other Fossil": 0.0012,
-      "Other Renewables": 0.0011,
-      "Solar": 0.0242,
-      "Wind": 0.0186
+      "Other Renewables": 0.001,
+      "Solar": 0.0249,
+      "Wind": 0.0182
     }
   },
   "NR": {
@@ -10529,14 +10529,14 @@
     },
     "2024": {
       "Bioenergy": 0.0114,
-      "Coal": 0.573,
+      "Coal": 0.5731,
       "Gas": 0.0881,
       "Hydro": 0.0204,
       "Nuclear": 0.0053,
       "Other Fossil": 0.0217,
       "Other Renewables": 0.0002,
       "Solar": 0.1155,
-      "Wind": 0.1643
+      "Wind": 0.1644
     }
   },
   "PM": {
@@ -10665,14 +10665,14 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Coal": 0.2343,
-      "Gas": 0.4729,
+      "Coal": 0.2153,
+      "Gas": 0.4688,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": 0.27,
+      "Other Fossil": 0.2932,
       "Other Renewables": 0,
-      "Solar": 0.0143,
-      "Wind": 0.0086
+      "Solar": 0.0142,
+      "Wind": 0.0085
     }
   },
   "PS": {
@@ -10783,7 +10783,7 @@
       "Gas": 0.3752,
       "Hydro": 0.1355,
       "Nuclear": 0.0383,
-      "Other Fossil": 0.008,
+      "Other Fossil": 0.0079,
       "Other Renewables": 0.0013,
       "Solar": 0.0615,
       "Wind": 0.2774
@@ -10791,24 +10791,24 @@
     "2023": {
       "Bioenergy": 0.0639,
       "Coal": 0.0294,
-      "Gas": 0.249,
+      "Gas": 0.2491,
       "Hydro": 0.2345,
       "Nuclear": 0.0422,
       "Other Fossil": 0.0079,
       "Other Renewables": 0.0014,
-      "Solar": 0.088,
+      "Solar": 0.0879,
       "Wind": 0.2837
     },
     "2024": {
-      "Bioenergy": 0.067,
-      "Coal": 0.0127,
-      "Gas": 0.1016,
-      "Hydro": 0.3712,
-      "Nuclear": 0.0216,
-      "Other Fossil": 0.0068,
-      "Other Renewables": 0.0007,
-      "Solar": 0.1008,
-      "Wind": 0.3176
+      "Bioenergy": 0.0669,
+      "Coal": 0.015,
+      "Gas": 0.1068,
+      "Hydro": 0.3693,
+      "Nuclear": 0.0247,
+      "Other Fossil": 0.0072,
+      "Other Renewables": 0.0008,
+      "Solar": 0.1023,
+      "Wind": 0.307
     }
   },
   "PY": {
@@ -11072,15 +11072,15 @@
       "Wind": 0.1314
     },
     "2024": {
-      "Bioenergy": 0.01,
-      "Coal": 0.123,
-      "Gas": 0.168,
-      "Hydro": 0.322,
-      "Nuclear": 0.2035,
+      "Bioenergy": 0.0094,
+      "Coal": 0.1263,
+      "Gas": 0.1803,
+      "Hydro": 0.3202,
+      "Nuclear": 0.1942,
       "Other Fossil": 0.0007,
       "Other Renewables": 0.0003,
-      "Solar": 0.0413,
-      "Wind": 0.131
+      "Solar": 0.0419,
+      "Wind": 0.1268
     }
   },
   "RS": {
@@ -11131,7 +11131,7 @@
     "2023": {
       "Bioenergy": 0.0069,
       "Coal": 0.6015,
-      "Gas": 0.0161,
+      "Gas": 0.0162,
       "Hydro": 0.3403,
       "Nuclear": 0.001,
       "Other Fossil": 0.0069,
@@ -11140,15 +11140,15 @@
       "Wind": 0.0268
     },
     "2024": {
-      "Bioenergy": 0.0084,
-      "Coal": 0.5784,
-      "Gas": 0.0132,
-      "Hydro": 0.343,
-      "Nuclear": 0.0053,
+      "Bioenergy": 0.0083,
+      "Coal": 0.5737,
+      "Gas": 0.0133,
+      "Hydro": 0.351,
+      "Nuclear": 0.0054,
       "Other Fossil": 0.0075,
       "Other Renewables": 0.0002,
-      "Solar": 0.003,
-      "Wind": 0.041
+      "Solar": 0.0031,
+      "Wind": 0.0375
     }
   },
   "RU": {
@@ -11209,14 +11209,14 @@
     },
     "2024": {
       "Bioenergy": 0.0008,
-      "Coal": 0.168,
-      "Gas": 0.4664,
-      "Hydro": 0.1703,
-      "Nuclear": 0.1775,
-      "Other Fossil": 0.0104,
+      "Coal": 0.1649,
+      "Gas": 0.4577,
+      "Hydro": 0.1827,
+      "Nuclear": 0.1773,
+      "Other Fossil": 0.0102,
       "Other Renewables": 0,
-      "Solar": 0.0016,
-      "Wind": 0.005
+      "Solar": 0.0017,
+      "Wind": 0.0048
     }
   },
   "RW": {
@@ -11616,15 +11616,15 @@
       "Wind": 0.2198
     },
     "2024": {
-      "Bioenergy": 0.0467,
+      "Bioenergy": 0.046,
       "Coal": 0,
       "Gas": 0,
-      "Hydro": 0.4259,
-      "Nuclear": 0.2956,
+      "Hydro": 0.4179,
+      "Nuclear": 0.2999,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0106,
-      "Wind": 0.2211
+      "Solar": 0.0108,
+      "Wind": 0.2254
     }
   },
   "SG": {
@@ -11820,15 +11820,15 @@
       "Wind": 0.0058
     },
     "2024": {
-      "Bioenergy": 0.0092,
-      "Coal": 0.1827,
-      "Gas": 0.0363,
-      "Hydro": 0.393,
-      "Nuclear": 0.3331,
-      "Other Fossil": 0.0034,
+      "Bioenergy": 0.009,
+      "Coal": 0.1998,
+      "Gas": 0.0354,
+      "Hydro": 0.3827,
+      "Nuclear": 0.3267,
+      "Other Fossil": 0.0044,
       "Other Renewables": 0.0002,
-      "Solar": 0.0376,
-      "Wind": 0.0046
+      "Solar": 0.0372,
+      "Wind": 0.0047
     }
   },
   "SK": {
@@ -11873,7 +11873,7 @@
       "Nuclear": 0.5908,
       "Other Fossil": 0.0639,
       "Other Renewables": 0.0153,
-      "Solar": 0.0225,
+      "Solar": 0.0224,
       "Wind": 0.0055
     },
     "2023": {
@@ -11888,13 +11888,13 @@
       "Wind": 0
     },
     "2024": {
-      "Bioenergy": 0.0326,
-      "Coal": 0.0143,
-      "Gas": 0.0671,
-      "Hydro": 0.1848,
-      "Nuclear": 0.6193,
-      "Other Fossil": 0.0453,
-      "Other Renewables": 0.0163,
+      "Bioenergy": 0.0328,
+      "Coal": 0.0146,
+      "Gas": 0.0697,
+      "Hydro": 0.1961,
+      "Nuclear": 0.6044,
+      "Other Fossil": 0.0456,
+      "Other Renewables": 0.0164,
       "Solar": 0.0203,
       "Wind": 0
     }
@@ -12344,7 +12344,7 @@
     "2022": {
       "Bioenergy": 0.0757,
       "Coal": 0.002,
-      "Gas": 0.1525,
+      "Gas": 0.1526,
       "Hydro": 0.3218,
       "Nuclear": 0.0012,
       "Other Fossil": 0.0728,
@@ -12366,13 +12366,13 @@
     "2024": {
       "Bioenergy": 0.1616,
       "Coal": 0.0013,
-      "Gas": 0.2651,
-      "Hydro": 0.1772,
+      "Gas": 0.2653,
+      "Hydro": 0.1769,
       "Nuclear": 0.0007,
       "Other Fossil": 0.0021,
       "Other Renewables": 0.1776,
       "Solar": 0.1636,
-      "Wind": 0.0509
+      "Wind": 0.051
     }
   },
   "SY": {
@@ -12772,15 +12772,15 @@
       "Wind": 0.0263
     },
     "2024": {
-      "Bioenergy": 0.0534,
-      "Coal": 0.2195,
-      "Gas": 0.6127,
-      "Hydro": 0.0439,
-      "Nuclear": 0.0071,
+      "Bioenergy": 0.0571,
+      "Coal": 0.2092,
+      "Gas": 0.6193,
+      "Hydro": 0.0447,
+      "Nuclear": 0.0064,
       "Other Fossil": 0.0008,
-      "Other Renewables": 0.0007,
-      "Solar": 0.0374,
-      "Wind": 0.0245
+      "Other Renewables": 0.0006,
+      "Solar": 0.0378,
+      "Wind": 0.024
     }
   },
   "TJ": {
@@ -13180,15 +13180,15 @@
       "Wind": 0.1063
     },
     "2024": {
-      "Bioenergy": 0.0276,
-      "Coal": 0.3295,
-      "Gas": 0.1307,
-      "Hydro": 0.2962,
-      "Nuclear": 0.0006,
+      "Bioenergy": 0.0272,
+      "Coal": 0.3342,
+      "Gas": 0.1361,
+      "Hydro": 0.283,
+      "Nuclear": 0.0005,
       "Other Fossil": 0.0038,
-      "Other Renewables": 0.0328,
-      "Solar": 0.0715,
-      "Wind": 0.1072
+      "Other Renewables": 0.0318,
+      "Solar": 0.0736,
+      "Wind": 0.1098
     }
   },
   "TT": {
@@ -13588,15 +13588,15 @@
       "Wind": 0.1001
     },
     "2024": {
-      "Bioenergy": 0.0109,
-      "Coal": 0.1395,
-      "Gas": 0.4014,
-      "Hydro": 0.0635,
-      "Nuclear": 0.1856,
-      "Other Fossil": 0.0087,
-      "Other Renewables": 0.0043,
-      "Solar": 0.0668,
-      "Wind": 0.1193
+      "Bioenergy": 0.0106,
+      "Coal": 0.1438,
+      "Gas": 0.4038,
+      "Hydro": 0.0598,
+      "Nuclear": 0.1822,
+      "Other Fossil": 0.0084,
+      "Other Renewables": 0.0041,
+      "Solar": 0.0698,
+      "Wind": 0.1175
     }
   },
   "UY": {
@@ -13656,15 +13656,15 @@
       "Wind": 0.4065
     },
     "2024": {
-      "Bioenergy": 0.1273,
+      "Bioenergy": 0.1251,
       "Coal": 0,
-      "Gas": 0.0204,
-      "Hydro": 0.5045,
+      "Gas": 0.0103,
+      "Hydro": 0.5019,
       "Nuclear": 0,
-      "Other Fossil": 0.0026,
+      "Other Fossil": 0.0013,
       "Other Renewables": 0,
-      "Solar": 0.0287,
-      "Wind": 0.3165
+      "Solar": 0.0291,
+      "Wind": 0.3324
     }
   },
   "UZ": {
@@ -13725,14 +13725,14 @@
     },
     "2024": {
       "Bioenergy": 0.0004,
-      "Coal": 0.0478,
+      "Coal": 0.0476,
       "Gas": 0.8347,
-      "Hydro": 0.1015,
+      "Hydro": 0.1017,
       "Nuclear": 0.0011,
       "Other Fossil": 0.0111,
       "Other Renewables": 0.0001,
       "Solar": 0.0017,
-      "Wind": 0.0017
+      "Wind": 0.0016
     }
   },
   "VC": {
@@ -14258,25 +14258,25 @@
     },
     "2023": {
       "Bioenergy": 0.0037,
-      "Coal": 0.7782,
+      "Coal": 0.7781,
       "Gas": 0.0329,
       "Hydro": 0.0752,
       "Nuclear": 0.0264,
       "Other Fossil": 0.0026,
       "Other Renewables": 0.0008,
-      "Solar": 0.0061,
+      "Solar": 0.0062,
       "Wind": 0.074
     },
     "2024": {
       "Bioenergy": 0.0024,
       "Coal": 0.8358,
       "Gas": 0.0203,
-      "Hydro": 0.0453,
-      "Nuclear": 0.0169,
+      "Hydro": 0.0452,
+      "Nuclear": 0.0168,
       "Other Fossil": 0.0016,
       "Other Renewables": 0.0005,
-      "Solar": 0.004,
-      "Wind": 0.0732
+      "Solar": 0.0041,
+      "Wind": 0.0733
     }
   },
   "YE": {