npm - @digital4better/data - Versions diffs - 1.1.42 → 1.1.44 - Mend

@digital4better/data 1.1.42 → 1.1.44

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 (65) hide show

package/data/factor/continent-monthly-green.csv +6 -0
package/data/factor/continent-monthly-green.json +66 -0
package/data/factor/continent-monthly.csv +6 -0
package/data/factor/continent-monthly.json +66 -0
package/data/factor/continent-yearly-green.csv +6 -6
package/data/factor/continent-yearly-green.json +54 -54
package/data/factor/continent-yearly.csv +6 -6
package/data/factor/continent-yearly.json +54 -54
package/data/factor/country-monthly-green.csv +214 -0
package/data/factor/country-monthly-green.json +2354 -0
package/data/factor/country-monthly.csv +214 -0
package/data/factor/country-monthly.json +2354 -0
package/data/factor/country-yearly-green.csv +83 -83
package/data/factor/country-yearly-green.json +744 -744
package/data/factor/country-yearly.csv +85 -85
package/data/factor/country-yearly.json +754 -754
package/data/factor/subdivision-monthly-green.csv +189 -126
package/data/factor/subdivision-monthly-green.json +1827 -1134
package/data/factor/subdivision-monthly.csv +189 -126
package/data/factor/subdivision-monthly.json +1827 -1134
package/data/factor/subdivision-yearly-green.csv +63 -63
package/data/factor/subdivision-yearly-green.json +567 -567
package/data/factor/subdivision-yearly.csv +63 -63
package/data/factor/subdivision-yearly.json +567 -567
package/data/factor/world-monthly-green.csv +1 -0
package/data/factor/world-monthly-green.json +11 -0
package/data/factor/world-monthly.csv +1 -0
package/data/factor/world-monthly.json +11 -0
package/data/factor/world-yearly-green.csv +1 -1
package/data/factor/world-yearly-green.json +9 -9
package/data/factor/world-yearly.csv +1 -1
package/data/factor/world-yearly.json +9 -9
package/data/mix/continent-monthly-green.csv +6 -0
package/data/mix/continent-monthly-green.json +36 -0
package/data/mix/continent-monthly.csv +6 -0
package/data/mix/continent-monthly.json +66 -0
package/data/mix/continent-yearly-green.csv +6 -6
package/data/mix/continent-yearly-green.json +23 -23
package/data/mix/continent-yearly.csv +6 -6
package/data/mix/continent-yearly.json +45 -45
package/data/mix/country-monthly-green.csv +214 -0
package/data/mix/country-monthly-green.json +1284 -0
package/data/mix/country-monthly.csv +214 -0
package/data/mix/country-monthly.json +2354 -0
package/data/mix/country-yearly-green.csv +83 -83
package/data/mix/country-yearly-green.json +291 -291
package/data/mix/country-yearly.csv +83 -83
package/data/mix/country-yearly.json +553 -553
package/data/mix/subdivision-monthly-green.csv +189 -126
package/data/mix/subdivision-monthly-green.json +812 -434
package/data/mix/subdivision-monthly.csv +189 -126
package/data/mix/subdivision-monthly.json +1531 -838
package/data/mix/subdivision-yearly-green.csv +63 -63
package/data/mix/subdivision-yearly-green.json +220 -220
package/data/mix/subdivision-yearly.csv +63 -63
package/data/mix/subdivision-yearly.json +411 -411
package/data/mix/world-monthly-green.csv +1 -0
package/data/mix/world-monthly-green.json +6 -0
package/data/mix/world-monthly.csv +1 -0
package/data/mix/world-monthly.json +11 -0
package/data/mix/world-yearly-green.csv +1 -1
package/data/mix/world-yearly-green.json +4 -4
package/data/mix/world-yearly.csv +1 -1
package/data/mix/world-yearly.json +8 -8
package/package.json +1 -1

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

@@ -124,15 +124,15 @@
       "Wind": 0.0577
     },
     "2024": {
-      "Bioenergy": 0.0153,
-      "Coal": 0.4707,
-      "Gas": 0.0824,
-      "Hydro": 0.2251,
-      "Nuclear": 0.0434,
+      "Bioenergy": 0.0151,
+      "Coal": 0.4665,
+      "Gas": 0.082,
+      "Hydro": 0.2287,
+      "Nuclear": 0.0435,
       "Other Fossil": 0.0216,
       "Other Renewables": 0.0041,
-      "Solar": 0.0707,
-      "Wind": 0.0666
+      "Solar": 0.0721,
+      "Wind": 0.0664
     }
   },
   "AG": {
@@ -260,15 +260,15 @@
       "Wind": 0.04
     },
     "2024": {
-      "Bioenergy": 0.0091,
-      "Coal": 0.0404,
-      "Gas": 0.07,
-      "Hydro": 0.7432,
-      "Nuclear": 0.0621,
+      "Bioenergy": 0.009,
+      "Coal": 0.0399,
+      "Gas": 0.0691,
+      "Hydro": 0.7438,
+      "Nuclear": 0.0622,
       "Other Fossil": 0.0058,
       "Other Renewables": 0.002,
-      "Solar": 0.0254,
-      "Wind": 0.0419
+      "Solar": 0.0275,
+      "Wind": 0.0406
     }
   },
   "AM": {
@@ -465,14 +465,14 @@
     },
     "2024": {
       "Bioenergy": 0.0073,
-      "Coal": 0.0018,
-      "Gas": 0.5105,
-      "Hydro": 0.255,
-      "Nuclear": 0.0879,
-      "Other Fossil": 0.0131,
+      "Coal": 0.0017,
+      "Gas": 0.5077,
+      "Hydro": 0.2588,
+      "Nuclear": 0.0882,
+      "Other Fossil": 0.0138,
       "Other Renewables": 0.0001,
-      "Solar": 0.0242,
-      "Wind": 0.1002
+      "Solar": 0.0236,
+      "Wind": 0.0988
     }
   },
   "AS": {
@@ -600,15 +600,15 @@
       "Wind": 0.1398
     },
     "2024": {
-      "Bioenergy": 0.0265,
+      "Bioenergy": 0.0258,
       "Coal": 0,
-      "Gas": 0.0759,
-      "Hydro": 0.6469,
+      "Gas": 0.0661,
+      "Hydro": 0.6611,
       "Nuclear": 0,
       "Other Fossil": 0.0152,
       "Other Renewables": 0,
-      "Solar": 0.0836,
-      "Wind": 0.1519
+      "Solar": 0.0909,
+      "Wind": 0.141
     }
   },
   "AU": {
@@ -668,15 +668,15 @@
       "Wind": 0.1345
     },
     "2024": {
-      "Bioenergy": 0.0015,
-      "Coal": 0.5633,
-      "Gas": 0.0808,
-      "Hydro": 0.0543,
+      "Bioenergy": 0.0016,
+      "Coal": 0.5683,
+      "Gas": 0.0859,
+      "Hydro": 0.0553,
       "Nuclear": 0,
-      "Other Fossil": 0.0003,
+      "Other Fossil": 0.0004,
       "Other Renewables": 0,
-      "Solar": 0.1806,
-      "Wind": 0.1192
+      "Solar": 0.1711,
+      "Wind": 0.1175
     }
   },
   "AW": {
@@ -873,14 +873,14 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Coal": 0.6125,
+      "Coal": 0.6219,
       "Gas": 0,
-      "Hydro": 0.3523,
+      "Hydro": 0.3416,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0211,
-      "Wind": 0.0141
+      "Solar": 0.0228,
+      "Wind": 0.0138
     }
   },
   "BB": {
@@ -1008,15 +1008,15 @@
       "Wind": 0.0117
     },
     "2024": {
-      "Bioenergy": 0.003,
-      "Coal": 0.3642,
-      "Gas": 0.4666,
-      "Hydro": 0.02,
-      "Nuclear": 0.0085,
-      "Other Fossil": 0.1023,
+      "Bioenergy": 0.0029,
+      "Coal": 0.3572,
+      "Gas": 0.4691,
+      "Hydro": 0.0203,
+      "Nuclear": 0.0084,
+      "Other Fossil": 0.1068,
       "Other Renewables": 0.0008,
       "Solar": 0.0216,
-      "Wind": 0.0131
+      "Wind": 0.0129
     }
   },
   "BE": {
@@ -1076,15 +1076,15 @@
       "Wind": 0.1829
     },
     "2024": {
-      "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
+      "Bioenergy": 0.0101,
+      "Coal": 0.0146,
+      "Gas": 0.1498,
+      "Hydro": 0.0233,
+      "Nuclear": 0.4098,
+      "Other Fossil": 0.0856,
+      "Other Renewables": 0.0007,
+      "Solar": 0.1248,
+      "Wind": 0.1813
     }
   },
   "BF": {
@@ -1212,15 +1212,15 @@
       "Wind": 0.0386
     },
     "2024": {
-      "Bioenergy": 0.0041,
-      "Coal": 0.2333,
-      "Gas": 0.0683,
-      "Hydro": 0.1103,
-      "Nuclear": 0.4195,
-      "Other Fossil": 0.0006,
+      "Bioenergy": 0.0044,
+      "Coal": 0.2256,
+      "Gas": 0.0677,
+      "Hydro": 0.117,
+      "Nuclear": 0.409,
+      "Other Fossil": 0.0007,
       "Other Renewables": 0.0002,
-      "Solar": 0.1219,
-      "Wind": 0.0417
+      "Solar": 0.1354,
+      "Wind": 0.04
     }
   },
   "BH": {
@@ -1620,15 +1620,15 @@
       "Wind": 0.0434
     },
     "2024": {
-      "Bioenergy": 0.0052,
+      "Bioenergy": 0.0075,
       "Coal": 0,
-      "Gas": 0.6465,
-      "Hydro": 0.2759,
+      "Gas": 0.6478,
+      "Hydro": 0.2701,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0293,
-      "Wind": 0.0431
+      "Solar": 0.0298,
+      "Wind": 0.0448
     }
   },
   "BR": {
@@ -1688,15 +1688,15 @@
       "Wind": 0.1416
     },
     "2024": {
-      "Bioenergy": 0.0112,
+      "Bioenergy": 0.0124,
       "Coal": 0.009,
-      "Gas": 0.0424,
-      "Hydro": 0.6862,
-      "Nuclear": 0.0239,
+      "Gas": 0.0442,
+      "Hydro": 0.6733,
+      "Nuclear": 0.0242,
       "Other Fossil": 0.0106,
       "Other Renewables": 0,
-      "Solar": 0.0971,
-      "Wind": 0.1196
+      "Solar": 0.0977,
+      "Wind": 0.1286
     }
   },
   "BS": {
@@ -2028,15 +2028,15 @@
       "Wind": 0.0381
     },
     "2024": {
-      "Bioenergy": 0.1704,
-      "Coal": 0.0165,
-      "Gas": 0.0947,
-      "Hydro": 0.5257,
+      "Bioenergy": 0.1706,
+      "Coal": 0.0164,
+      "Gas": 0.0955,
+      "Hydro": 0.5242,
       "Nuclear": 0.0097,
-      "Other Fossil": 0.106,
+      "Other Fossil": 0.1063,
       "Other Renewables": 0.0025,
-      "Solar": 0.0403,
-      "Wind": 0.0341
+      "Solar": 0.0402,
+      "Wind": 0.0347
     }
   },
   "CA": {
@@ -2096,15 +2096,15 @@
       "Wind": 0.0646
     },
     "2024": {
-      "Bioenergy": 0.0153,
-      "Coal": 0.0453,
-      "Gas": 0.1427,
-      "Hydro": 0.5671,
-      "Nuclear": 0.1208,
-      "Other Fossil": 0.01,
+      "Bioenergy": 0.0152,
+      "Coal": 0.0451,
+      "Gas": 0.1422,
+      "Hydro": 0.5663,
+      "Nuclear": 0.1201,
+      "Other Fossil": 0.0099,
       "Other Renewables": 0.0005,
-      "Solar": 0.0091,
-      "Wind": 0.0892
+      "Solar": 0.0095,
+      "Wind": 0.0912
     }
   },
   "CD": {
@@ -2371,11 +2371,11 @@
       "Bioenergy": 0,
       "Coal": 0.0002,
       "Gas": 0.0004,
-      "Hydro": 0.6084,
-      "Nuclear": 0.2813,
-      "Other Fossil": 0.0484,
+      "Hydro": 0.6193,
+      "Nuclear": 0.268,
+      "Other Fossil": 0.0473,
       "Other Renewables": 0,
-      "Solar": 0.0594,
+      "Solar": 0.0629,
       "Wind": 0.0018
     }
   },
@@ -2572,15 +2572,15 @@
       "Wind": 0.1187
     },
     "2024": {
-      "Bioenergy": 0.0246,
-      "Coal": 0.1747,
-      "Gas": 0.1817,
-      "Hydro": 0.2727,
+      "Bioenergy": 0.0239,
+      "Coal": 0.1701,
+      "Gas": 0.1813,
+      "Hydro": 0.2842,
       "Nuclear": 0,
-      "Other Fossil": 0.013,
+      "Other Fossil": 0.0128,
       "Other Renewables": 0.0044,
-      "Solar": 0.2107,
-      "Wind": 0.1182
+      "Solar": 0.2025,
+      "Wind": 0.1209
     }
   },
   "CM": {
@@ -2708,15 +2708,15 @@
       "Wind": 0.0952
     },
     "2024": {
-      "Bioenergy": 0.0165,
-      "Coal": 0.5956,
-      "Gas": 0.0287,
-      "Hydro": 0.119,
-      "Nuclear": 0.0452,
+      "Bioenergy": 0.0164,
+      "Coal": 0.5894,
+      "Gas": 0.0284,
+      "Hydro": 0.1277,
+      "Nuclear": 0.045,
       "Other Fossil": 0.0023,
       "Other Renewables": 0,
-      "Solar": 0.0807,
-      "Wind": 0.112
+      "Solar": 0.0819,
+      "Wind": 0.1089
     }
   },
   "CO": {
@@ -2777,14 +2777,14 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Coal": 0.136,
-      "Gas": 0.0848,
-      "Hydro": 0.7283,
+      "Coal": 0.1291,
+      "Gas": 0.0811,
+      "Hydro": 0.7392,
       "Nuclear": 0,
-      "Other Fossil": 0.0077,
+      "Other Fossil": 0.0075,
       "Other Renewables": 0,
-      "Solar": 0.0407,
-      "Wind": 0.0025
+      "Solar": 0.0408,
+      "Wind": 0.0024
     }
   },
   "CR": {
@@ -2844,15 +2844,15 @@
       "Wind": 0.1222
     },
     "2024": {
-      "Bioenergy": 0.0065,
-      "Coal": 0.0012,
-      "Gas": 0.0065,
-      "Hydro": 0.5638,
-      "Nuclear": 0.0007,
-      "Other Fossil": 0.1829,
-      "Other Renewables": 0.1172,
-      "Solar": 0.0021,
-      "Wind": 0.1193
+      "Bioenergy": 0.0056,
+      "Coal": 0.001,
+      "Gas": 0.0056,
+      "Hydro": 0.5973,
+      "Nuclear": 0.0006,
+      "Other Fossil": 0.1656,
+      "Other Renewables": 0.1171,
+      "Solar": 0.0018,
+      "Wind": 0.1055
     }
   },
   "CU": {
@@ -3053,10 +3053,10 @@
       "Gas": 0,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": 0.7636,
+      "Other Fossil": 0.7569,
       "Other Renewables": 0,
-      "Solar": 0.1864,
-      "Wind": 0.05
+      "Solar": 0.1922,
+      "Wind": 0.051
     }
   },
   "CZ": {
@@ -3116,15 +3116,15 @@
       "Wind": 0.0105
     },
     "2024": {
-      "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
+      "Bioenergy": 0.0364,
+      "Coal": 0.3294,
+      "Gas": 0.0482,
+      "Hydro": 0.04,
+      "Nuclear": 0.4178,
+      "Other Fossil": 0.0147,
+      "Other Renewables": 0.0369,
+      "Solar": 0.0661,
+      "Wind": 0.0105
     }
   },
   "DE": {
@@ -3184,15 +3184,15 @@
       "Wind": 0.2709
     },
     "2024": {
-      "Bioenergy": 0.0886,
-      "Coal": 0.1952,
-      "Gas": 0.1735,
-      "Hydro": 0.0554,
-      "Nuclear": 0.0084,
-      "Other Fossil": 0.0416,
+      "Bioenergy": 0.0885,
+      "Coal": 0.193,
+      "Gas": 0.1713,
+      "Hydro": 0.0582,
+      "Nuclear": 0.0097,
+      "Other Fossil": 0.0408,
       "Other Renewables": 0.0003,
-      "Solar": 0.1486,
-      "Wind": 0.2883
+      "Solar": 0.164,
+      "Wind": 0.2741
     }
   },
   "DJ": {
@@ -3320,15 +3320,15 @@
       "Wind": 0.5468
     },
     "2024": {
-      "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.1059,
-      "Wind": 0.568
+      "Bioenergy": 0.0978,
+      "Coal": 0.0936,
+      "Gas": 0.0645,
+      "Hydro": 0.0165,
+      "Nuclear": 0.0152,
+      "Other Fossil": 0.0326,
+      "Other Renewables": 0.0005,
+      "Solar": 0.1201,
+      "Wind": 0.5591
     }
   },
   "DM": {
@@ -3592,15 +3592,15 @@
       "Wind": 0.0088
     },
     "2024": {
-      "Bioenergy": 0.0007,
-      "Coal": 0.0007,
+      "Bioenergy": 0.0006,
+      "Coal": 0.0006,
       "Gas": 0.0298,
-      "Hydro": 0.7044,
+      "Hydro": 0.7012,
       "Nuclear": 0.0004,
-      "Other Fossil": 0.2577,
+      "Other Fossil": 0.2611,
       "Other Renewables": 0.0001,
-      "Solar": 0.0012,
-      "Wind": 0.0051
+      "Solar": 0.0011,
+      "Wind": 0.005
     }
   },
   "EE": {
@@ -3660,15 +3660,15 @@
       "Wind": 0.1556
     },
     "2024": {
-      "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
+      "Bioenergy": 0.0706,
+      "Coal": 0.0467,
+      "Gas": 0.0811,
+      "Hydro": 0.0686,
+      "Nuclear": 0.0701,
+      "Other Fossil": 0.3355,
+      "Other Renewables": 0.0023,
+      "Solar": 0.1563,
+      "Wind": 0.1688
     }
   },
   "EG": {
@@ -3864,15 +3864,15 @@
       "Wind": 0.249
     },
     "2024": {
-      "Bioenergy": 0.0139,
-      "Coal": 0.0111,
+      "Bioenergy": 0.0142,
+      "Coal": 0.0109,
       "Gas": 0.1434,
-      "Hydro": 0.1643,
-      "Nuclear": 0.2054,
-      "Other Fossil": 0.0097,
+      "Hydro": 0.157,
+      "Nuclear": 0.2079,
+      "Other Fossil": 0.0099,
       "Other Renewables": 0.0028,
-      "Solar": 0.1887,
-      "Wind": 0.2606
+      "Solar": 0.199,
+      "Wind": 0.2549
     }
   },
   "ET": {
@@ -4000,15 +4000,15 @@
       "Wind": 0.1777
     },
     "2024": {
-      "Bioenergy": 0.1191,
-      "Coal": 0.0294,
-      "Gas": 0.0288,
-      "Hydro": 0.1979,
-      "Nuclear": 0.3568,
-      "Other Fossil": 0.047,
+      "Bioenergy": 0.1168,
+      "Coal": 0.0262,
+      "Gas": 0.0256,
+      "Hydro": 0.2014,
+      "Nuclear": 0.3694,
+      "Other Fossil": 0.0451,
       "Other Renewables": 0.0005,
-      "Solar": 0.015,
-      "Wind": 0.2054
+      "Solar": 0.0163,
+      "Wind": 0.1988
     }
   },
   "FJ": {
@@ -4273,14 +4273,14 @@
     },
     "2024": {
       "Bioenergy": 0.0059,
-      "Coal": 0.0009,
-      "Gas": 0.0376,
-      "Hydro": 0.136,
-      "Nuclear": 0.6764,
+      "Coal": 0.0008,
+      "Gas": 0.0343,
+      "Hydro": 0.1377,
+      "Nuclear": 0.6782,
       "Other Fossil": 0.0058,
       "Other Renewables": 0,
-      "Solar": 0.0426,
-      "Wind": 0.0949
+      "Solar": 0.046,
+      "Wind": 0.0912
     }
   },
   "GA": {
@@ -4408,15 +4408,15 @@
       "Wind": 0.314
     },
     "2024": {
-      "Bioenergy": 0.0707,
-      "Coal": 0.0275,
-      "Gas": 0.2928,
-      "Hydro": 0.0416,
-      "Nuclear": 0.1656,
-      "Other Fossil": 0.0138,
+      "Bioenergy": 0.0708,
+      "Coal": 0.0264,
+      "Gas": 0.2866,
+      "Hydro": 0.0415,
+      "Nuclear": 0.1704,
+      "Other Fossil": 0.0143,
       "Other Renewables": 0.0009,
-      "Solar": 0.0632,
-      "Wind": 0.3239
+      "Solar": 0.0706,
+      "Wind": 0.3185
     }
   },
   "GD": {
@@ -4544,15 +4544,15 @@
       "Wind": 0.0124
     },
     "2024": {
-      "Bioenergy": 0.0012,
-      "Coal": 0.0352,
-      "Gas": 0.1831,
-      "Hydro": 0.76,
-      "Nuclear": 0.0031,
-      "Other Fossil": 0.0004,
+      "Bioenergy": 0.001,
+      "Coal": 0.0304,
+      "Gas": 0.1582,
+      "Hydro": 0.7917,
+      "Nuclear": 0.0027,
+      "Other Fossil": 0.0003,
       "Other Renewables": 0.0003,
-      "Solar": 0.0039,
-      "Wind": 0.0127
+      "Solar": 0.0034,
+      "Wind": 0.012
     }
   },
   "GF": {
@@ -5157,14 +5157,14 @@
     },
     "2024": {
       "Bioenergy": 0.001,
-      "Coal": 0.0695,
-      "Gas": 0.3974,
-      "Hydro": 0.0671,
-      "Nuclear": 0.0067,
+      "Coal": 0.0653,
+      "Gas": 0.4042,
+      "Hydro": 0.0681,
+      "Nuclear": 0.0068,
       "Other Fossil": 0.0006,
       "Other Renewables": 0.0002,
-      "Solar": 0.2199,
-      "Wind": 0.2376
+      "Solar": 0.2269,
+      "Wind": 0.227
     }
   },
   "GT": {
@@ -5497,14 +5497,14 @@
     },
     "2024": {
       "Bioenergy": 0.0075,
-      "Coal": 0.5668,
-      "Gas": 0.3403,
-      "Hydro": 0.0259,
+      "Coal": 0.5655,
+      "Gas": 0.3402,
+      "Hydro": 0.027,
       "Nuclear": 0.0133,
       "Other Fossil": 0.0052,
       "Other Renewables": 0.0013,
-      "Solar": 0.0194,
-      "Wind": 0.0204
+      "Solar": 0.0199,
+      "Wind": 0.0203
     }
   },
   "HN": {
@@ -5566,8 +5566,8 @@
     "2024": {
       "Bioenergy": 0.1288,
       "Coal": 0.0009,
-      "Gas": 0.0049,
-      "Hydro": 0.2247,
+      "Gas": 0.005,
+      "Hydro": 0.2246,
       "Nuclear": 0.0005,
       "Other Fossil": 0.4393,
       "Other Renewables": 0.0265,
@@ -5632,15 +5632,15 @@
       "Wind": 0.1603
     },
     "2024": {
-      "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
+      "Bioenergy": 0.0444,
+      "Coal": 0.0337,
+      "Gas": 0.2156,
+      "Hydro": 0.4156,
+      "Nuclear": 0.0545,
+      "Other Fossil": 0.0121,
+      "Other Renewables": 0.016,
+      "Solar": 0.0372,
+      "Wind": 0.1709
     }
   },
   "HT": {
@@ -5768,15 +5768,15 @@
       "Wind": 0.0474
     },
     "2024": {
-      "Bioenergy": 0.0261,
-      "Coal": 0.0897,
-      "Gas": 0.1827,
-      "Hydro": 0.0502,
-      "Nuclear": 0.3664,
-      "Other Fossil": 0.0184,
+      "Bioenergy": 0.0252,
+      "Coal": 0.0884,
+      "Gas": 0.1742,
+      "Hydro": 0.0487,
+      "Nuclear": 0.3677,
+      "Other Fossil": 0.0181,
       "Other Renewables": 0.0037,
-      "Solar": 0.2133,
-      "Wind": 0.0494
+      "Solar": 0.228,
+      "Wind": 0.0459
     }
   },
   "ID": {
@@ -5904,15 +5904,15 @@
       "Wind": 0.3594
     },
     "2024": {
-      "Bioenergy": 0.0078,
-      "Coal": 0.042,
-      "Gas": 0.4408,
-      "Hydro": 0.0594,
-      "Nuclear": 0.0297,
-      "Other Fossil": 0.0418,
+      "Bioenergy": 0.0079,
+      "Coal": 0.0403,
+      "Gas": 0.4538,
+      "Hydro": 0.0582,
+      "Nuclear": 0.0306,
+      "Other Fossil": 0.0436,
       "Other Renewables": 0.001,
-      "Solar": 0.0293,
-      "Wind": 0.3481
+      "Solar": 0.0328,
+      "Wind": 0.3318
     }
   },
   "IL": {
@@ -6040,15 +6040,15 @@
       "Wind": 0.0482
     },
     "2024": {
-      "Bioenergy": 0.009,
-      "Coal": 0.7648,
-      "Gas": 0.0233,
-      "Hydro": 0.061,
-      "Nuclear": 0.0272,
+      "Bioenergy": 0.0082,
+      "Coal": 0.7598,
+      "Gas": 0.0245,
+      "Hydro": 0.0638,
+      "Nuclear": 0.0271,
       "Other Fossil": 0.0002,
       "Other Renewables": 0.0016,
-      "Solar": 0.075,
-      "Wind": 0.0379
+      "Solar": 0.0751,
+      "Wind": 0.0396
     }
   },
   "IQ": {
@@ -6178,10 +6178,10 @@
     "2024": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.7807,
-      "Hydro": 0.0579,
+      "Gas": 0.7936,
+      "Hydro": 0.0592,
       "Nuclear": 0,
-      "Other Fossil": 0.1614,
+      "Other Fossil": 0.1473,
       "Other Renewables": 0,
       "Solar": 0,
       "Wind": 0
@@ -6312,15 +6312,15 @@
       "Wind": 0.1016
     },
     "2024": {
-      "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
+      "Bioenergy": 0.0586,
+      "Coal": 0.0357,
+      "Gas": 0.3606,
+      "Hydro": 0.2089,
+      "Nuclear": 0.0351,
+      "Other Fossil": 0.0327,
+      "Other Renewables": 0.0195,
+      "Solar": 0.1419,
+      "Wind": 0.107
     }
   },
   "JM": {
@@ -6516,15 +6516,15 @@
       "Wind": 0.0183
     },
     "2024": {
-      "Bioenergy": 0.0593,
-      "Coal": 0.2777,
-      "Gas": 0.3391,
-      "Hydro": 0.0705,
-      "Nuclear": 0.0842,
-      "Other Fossil": 0.0342,
-      "Other Renewables": 0.0095,
-      "Solar": 0.1039,
-      "Wind": 0.0218
+      "Bioenergy": 0.0594,
+      "Coal": 0.2754,
+      "Gas": 0.3398,
+      "Hydro": 0.0712,
+      "Nuclear": 0.0845,
+      "Other Fossil": 0.0336,
+      "Other Renewables": 0.0096,
+      "Solar": 0.1045,
+      "Wind": 0.0221
     }
   },
   "KE": {
@@ -6585,14 +6585,14 @@
     },
     "2024": {
       "Bioenergy": 0.0093,
-      "Coal": 0.0348,
+      "Coal": 0.0349,
       "Gas": 0.0473,
-      "Hydro": 0.2945,
+      "Hydro": 0.301,
       "Nuclear": 0.0018,
-      "Other Fossil": 0.0732,
-      "Other Renewables": 0.3913,
-      "Solar": 0.0367,
-      "Wind": 0.1112
+      "Other Fossil": 0.0739,
+      "Other Renewables": 0.3891,
+      "Solar": 0.0368,
+      "Wind": 0.106
     }
   },
   "KG": {
@@ -6720,15 +6720,15 @@
       "Wind": 0.0181
     },
     "2024": {
-      "Bioenergy": 0.0132,
-      "Coal": 0.4739,
-      "Gas": 0.0258,
-      "Hydro": 0.3655,
+      "Bioenergy": 0.0131,
+      "Coal": 0.4726,
+      "Gas": 0.0257,
+      "Hydro": 0.3666,
       "Nuclear": 0.0136,
       "Other Fossil": 0.0562,
       "Other Renewables": 0.0013,
-      "Solar": 0.0296,
-      "Wind": 0.0209
+      "Solar": 0.0301,
+      "Wind": 0.0208
     }
   },
   "KI": {
@@ -7060,14 +7060,14 @@
       "Wind": 0.0058
     },
     "2024": {
-      "Bioenergy": 0.0211,
-      "Coal": 0.2705,
-      "Gas": 0.2832,
-      "Hydro": 0.0084,
-      "Nuclear": 0.3256,
-      "Other Fossil": 0.0087,
-      "Other Renewables": 0.0138,
-      "Solar": 0.0619,
+      "Bioenergy": 0.0209,
+      "Coal": 0.2637,
+      "Gas": 0.2816,
+      "Hydro": 0.0089,
+      "Nuclear": 0.3298,
+      "Other Fossil": 0.009,
+      "Other Renewables": 0.0139,
+      "Solar": 0.0654,
       "Wind": 0.0068
     }
   },
@@ -7265,14 +7265,14 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Coal": 0.6549,
-      "Gas": 0.2016,
-      "Hydro": 0.0872,
+      "Coal": 0.6506,
+      "Gas": 0.2003,
+      "Hydro": 0.0917,
       "Nuclear": 0,
-      "Other Fossil": 0.0005,
+      "Other Fossil": 0.0004,
       "Other Renewables": 0,
-      "Solar": 0.0157,
-      "Wind": 0.04
+      "Solar": 0.0166,
+      "Wind": 0.0405
     }
   },
   "LA": {
@@ -7679,7 +7679,7 @@
       "Nuclear": 0.0079,
       "Other Fossil": 0.0321,
       "Other Renewables": 0.0031,
-      "Solar": 0.0068,
+      "Solar": 0.0067,
       "Wind": 0.0115
     }
   },
@@ -7740,15 +7740,15 @@
       "Wind": 0.2719
     },
     "2024": {
-      "Bioenergy": 0.0319,
-      "Coal": 0.0592,
-      "Gas": 0.1611,
-      "Hydro": 0.1276,
-      "Nuclear": 0.0894,
-      "Other Fossil": 0.0729,
+      "Bioenergy": 0.032,
+      "Coal": 0.0577,
+      "Gas": 0.1577,
+      "Hydro": 0.1248,
+      "Nuclear": 0.088,
+      "Other Fossil": 0.0743,
       "Other Renewables": 0.0029,
-      "Solar": 0.1394,
-      "Wind": 0.3156
+      "Solar": 0.1608,
+      "Wind": 0.3018
     }
   },
   "LU": {
@@ -7808,15 +7808,15 @@
       "Wind": 0.2007
     },
     "2024": {
-      "Bioenergy": 0.058,
-      "Coal": 0.0939,
-      "Gas": 0.1796,
-      "Hydro": 0.1684,
-      "Nuclear": 0.1437,
-      "Other Fossil": 0.0382,
+      "Bioenergy": 0.0601,
+      "Coal": 0.0929,
+      "Gas": 0.1752,
+      "Hydro": 0.1701,
+      "Nuclear": 0.1438,
+      "Other Fossil": 0.0384,
       "Other Renewables": 0.0047,
-      "Solar": 0.1126,
-      "Wind": 0.2008
+      "Solar": 0.1234,
+      "Wind": 0.1913
     }
   },
   "LV": {
@@ -7876,15 +7876,15 @@
       "Wind": 0.065
     },
     "2024": {
-      "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
+      "Bioenergy": 0.0367,
+      "Coal": 0.0195,
+      "Gas": 0.2275,
+      "Hydro": 0.5956,
+      "Nuclear": 0.0327,
+      "Other Fossil": 0.019,
+      "Other Renewables": 0.0011,
+      "Solar": 0.0248,
+      "Wind": 0.0431
     }
   },
   "LY": {
@@ -8080,15 +8080,15 @@
       "Wind": 0.0094
     },
     "2024": {
-      "Bioenergy": 0.0011,
-      "Coal": 0.0055,
-      "Gas": 0.9095,
-      "Hydro": 0.0499,
-      "Nuclear": 0.0078,
-      "Other Fossil": 0.0008,
+      "Bioenergy": 0.001,
+      "Coal": 0.0051,
+      "Gas": 0.9129,
+      "Hydro": 0.0501,
+      "Nuclear": 0.0073,
+      "Other Fossil": 0.0007,
       "Other Renewables": 0.0002,
-      "Solar": 0.0015,
-      "Wind": 0.0238
+      "Solar": 0.0016,
+      "Wind": 0.0209
     }
   },
   "ME": {
@@ -8148,15 +8148,15 @@
       "Wind": 0.0889
     },
     "2024": {
-      "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
+      "Bioenergy": 0.0039,
+      "Coal": 0.3064,
+      "Gas": 0.0284,
+      "Hydro": 0.513,
+      "Nuclear": 0.028,
+      "Other Fossil": 0.0026,
+      "Other Renewables": 0.0009,
+      "Solar": 0.0166,
+      "Wind": 0.1002
     }
   },
   "MG": {
@@ -8284,15 +8284,15 @@
       "Wind": 0.0285
     },
     "2024": {
-      "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
+      "Bioenergy": 0.0178,
+      "Coal": 0.4408,
+      "Gas": 0.1654,
+      "Hydro": 0.2661,
+      "Nuclear": 0.0211,
+      "Other Fossil": 0.002,
+      "Other Renewables": 0.0007,
+      "Solar": 0.0437,
+      "Wind": 0.0424
     }
   },
   "ML": {
@@ -8489,14 +8489,14 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Coal": 0.9044,
+      "Coal": 0.9025,
       "Gas": 0,
       "Hydro": 0,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
       "Solar": 0,
-      "Wind": 0.0956
+      "Wind": 0.0975
     }
   },
   "MO": {
@@ -8556,15 +8556,15 @@
       "Wind": 0.0601
     },
     "2024": {
-      "Bioenergy": 0.0537,
-      "Coal": 0.4766,
-      "Gas": 0.1632,
-      "Hydro": 0.0882,
-      "Nuclear": 0.0453,
+      "Bioenergy": 0.0535,
+      "Coal": 0.4722,
+      "Gas": 0.1628,
+      "Hydro": 0.092,
+      "Nuclear": 0.0454,
       "Other Fossil": 0.0343,
       "Other Renewables": 0.0043,
-      "Solar": 0.065,
-      "Wind": 0.0695
+      "Solar": 0.0664,
+      "Wind": 0.0692
     }
   },
   "MQ": {
@@ -8828,15 +8828,15 @@
       "Wind": 0.0283
     },
     "2024": {
-      "Bioenergy": 0.0078,
-      "Coal": 0.0349,
-      "Gas": 0.6531,
-      "Hydro": 0.054,
-      "Nuclear": 0.0538,
+      "Bioenergy": 0.0077,
+      "Coal": 0.0343,
+      "Gas": 0.648,
+      "Hydro": 0.0542,
+      "Nuclear": 0.0535,
       "Other Fossil": 0.005,
-      "Other Renewables": 0.0018,
-      "Solar": 0.153,
-      "Wind": 0.0366
+      "Other Renewables": 0.0017,
+      "Solar": 0.1605,
+      "Wind": 0.0352
     }
   },
   "MU": {
@@ -9100,15 +9100,15 @@
       "Wind": 0.0598
     },
     "2024": {
-      "Bioenergy": 0.0005,
-      "Coal": 0.0733,
-      "Gas": 0.5693,
-      "Hydro": 0.0496,
-      "Nuclear": 0.0285,
-      "Other Fossil": 0.1421,
-      "Other Renewables": 0.0114,
-      "Solar": 0.056,
-      "Wind": 0.0694
+      "Bioenergy": 0.0004,
+      "Coal": 0.0731,
+      "Gas": 0.5694,
+      "Hydro": 0.0505,
+      "Nuclear": 0.0273,
+      "Other Fossil": 0.1422,
+      "Other Renewables": 0.0113,
+      "Solar": 0.0565,
+      "Wind": 0.0693
     }
   },
   "MY": {
@@ -9510,8 +9510,8 @@
     "2024": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.7732,
-      "Hydro": 0.2268,
+      "Gas": 0.7807,
+      "Hydro": 0.2193,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
@@ -9577,14 +9577,14 @@
     },
     "2024": {
       "Bioenergy": 0.1684,
-      "Coal": 0.0034,
-      "Gas": 0.0192,
-      "Hydro": 0.0873,
+      "Coal": 0.0033,
+      "Gas": 0.0194,
+      "Hydro": 0.0869,
       "Nuclear": 0.002,
-      "Other Fossil": 0.3989,
+      "Other Fossil": 0.399,
       "Other Renewables": 0.1562,
-      "Solar": 0.012,
-      "Wind": 0.1527
+      "Solar": 0.0119,
+      "Wind": 0.1528
     }
   },
   "NL": {
@@ -9644,15 +9644,15 @@
       "Wind": 0.2525
     },
     "2024": {
-      "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
+      "Bioenergy": 0.0431,
+      "Coal": 0.0573,
+      "Gas": 0.3554,
+      "Hydro": 0.0037,
+      "Nuclear": 0.0231,
+      "Other Fossil": 0.0112,
+      "Other Renewables": 0.0035,
+      "Solar": 0.225,
+      "Wind": 0.2776
     }
   },
   "NO": {
@@ -9714,13 +9714,13 @@
     "2024": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.0107,
-      "Hydro": 0.8893,
+      "Gas": 0.0108,
+      "Hydro": 0.8905,
       "Nuclear": 0,
       "Other Fossil": 0.0018,
-      "Other Renewables": 0.0028,
+      "Other Renewables": 0.003,
       "Solar": 0,
-      "Wind": 0.0953
+      "Wind": 0.0939
     }
   },
   "NP": {
@@ -9780,15 +9780,15 @@
       "Wind": 0.0159
     },
     "2024": {
-      "Bioenergy": 0.0039,
-      "Coal": 0.1163,
-      "Gas": 0.021,
-      "Hydro": 0.8025,
-      "Nuclear": 0.011,
+      "Bioenergy": 0.0038,
+      "Coal": 0.1152,
+      "Gas": 0.0208,
+      "Hydro": 0.8034,
+      "Nuclear": 0.0111,
       "Other Fossil": 0.0012,
       "Other Renewables": 0.001,
-      "Solar": 0.0249,
-      "Wind": 0.0182
+      "Solar": 0.0252,
+      "Wind": 0.0181
     }
   },
   "NR": {
@@ -9984,15 +9984,15 @@
       "Wind": 0.0711
     },
     "2024": {
-      "Bioenergy": 0.0054,
-      "Coal": 0.0515,
-      "Gas": 0.1166,
-      "Hydro": 0.5541,
+      "Bioenergy": 0.005,
+      "Coal": 0.0555,
+      "Gas": 0.1194,
+      "Hydro": 0.5466,
       "Nuclear": 0,
       "Other Fossil": 0,
-      "Other Renewables": 0.1911,
+      "Other Renewables": 0.1929,
       "Solar": 0,
-      "Wind": 0.0813
+      "Wind": 0.0806
     }
   },
   "OM": {
@@ -10188,15 +10188,15 @@
       "Wind": 0.0404
     },
     "2024": {
-      "Bioenergy": 0.005,
+      "Bioenergy": 0.0052,
       "Coal": 0,
-      "Gas": 0.3312,
-      "Hydro": 0.5841,
+      "Gas": 0.3514,
+      "Hydro": 0.5632,
       "Nuclear": 0,
-      "Other Fossil": 0.004,
+      "Other Fossil": 0.0046,
       "Other Renewables": 0,
-      "Solar": 0.0181,
-      "Wind": 0.0574
+      "Solar": 0.0179,
+      "Wind": 0.0576
     }
   },
   "PF": {
@@ -10392,15 +10392,15 @@
       "Wind": 0.0112
     },
     "2024": {
-      "Bioenergy": 0.0102,
-      "Coal": 0.623,
-      "Gas": 0.1421,
-      "Hydro": 0.0775,
+      "Bioenergy": 0.0101,
+      "Coal": 0.6254,
+      "Gas": 0.141,
+      "Hydro": 0.0765,
       "Nuclear": 0,
       "Other Fossil": 0.0071,
-      "Other Renewables": 0.0907,
-      "Solar": 0.0329,
-      "Wind": 0.0165
+      "Other Renewables": 0.0905,
+      "Solar": 0.033,
+      "Wind": 0.0164
     }
   },
   "PK": {
@@ -10460,15 +10460,15 @@
       "Wind": 0.0338
     },
     "2024": {
-      "Bioenergy": 0.0082,
-      "Coal": 0.146,
-      "Gas": 0.3167,
-      "Hydro": 0.2591,
-      "Nuclear": 0.2139,
-      "Other Fossil": 0.017,
+      "Bioenergy": 0.0076,
+      "Coal": 0.1448,
+      "Gas": 0.315,
+      "Hydro": 0.2685,
+      "Nuclear": 0.2092,
+      "Other Fossil": 0.0148,
       "Other Renewables": 0,
-      "Solar": 0.0105,
-      "Wind": 0.0285
+      "Solar": 0.0103,
+      "Wind": 0.0298
     }
   },
   "PL": {
@@ -10528,15 +10528,15 @@
       "Wind": 0.1447
     },
     "2024": {
-      "Bioenergy": 0.0114,
-      "Coal": 0.5731,
-      "Gas": 0.0881,
-      "Hydro": 0.0204,
-      "Nuclear": 0.0053,
-      "Other Fossil": 0.0217,
+      "Bioenergy": 0.0116,
+      "Coal": 0.571,
+      "Gas": 0.0838,
+      "Hydro": 0.0199,
+      "Nuclear": 0.0052,
+      "Other Fossil": 0.0215,
       "Other Renewables": 0.0002,
-      "Solar": 0.1155,
-      "Wind": 0.1644
+      "Solar": 0.1283,
+      "Wind": 0.1585
     }
   },
   "PM": {
@@ -10665,14 +10665,14 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Coal": 0.2153,
-      "Gas": 0.4688,
+      "Coal": 0.2147,
+      "Gas": 0.468,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": 0.2932,
+      "Other Fossil": 0.2943,
       "Other Renewables": 0,
-      "Solar": 0.0142,
-      "Wind": 0.0085
+      "Solar": 0.0145,
+      "Wind": 0.0084
     }
   },
   "PS": {
@@ -10800,15 +10800,15 @@
       "Wind": 0.2837
     },
     "2024": {
-      "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
+      "Bioenergy": 0.069,
+      "Coal": 0.0194,
+      "Gas": 0.1089,
+      "Hydro": 0.3531,
+      "Nuclear": 0.0321,
+      "Other Fossil": 0.0079,
+      "Other Renewables": 0.001,
+      "Solar": 0.112,
+      "Wind": 0.2966
     }
   },
   "PY": {
@@ -11073,14 +11073,14 @@
     },
     "2024": {
       "Bioenergy": 0.0094,
-      "Coal": 0.1263,
-      "Gas": 0.1803,
-      "Hydro": 0.3202,
-      "Nuclear": 0.1942,
-      "Other Fossil": 0.0007,
+      "Coal": 0.1314,
+      "Gas": 0.1806,
+      "Hydro": 0.3234,
+      "Nuclear": 0.1861,
+      "Other Fossil": 0.0008,
       "Other Renewables": 0.0003,
-      "Solar": 0.0419,
-      "Wind": 0.1268
+      "Solar": 0.046,
+      "Wind": 0.1219
     }
   },
   "RS": {
@@ -11140,15 +11140,15 @@
       "Wind": 0.0268
     },
     "2024": {
-      "Bioenergy": 0.0083,
-      "Coal": 0.5737,
-      "Gas": 0.0133,
-      "Hydro": 0.351,
-      "Nuclear": 0.0054,
-      "Other Fossil": 0.0075,
+      "Bioenergy": 0.0086,
+      "Coal": 0.5667,
+      "Gas": 0.014,
+      "Hydro": 0.355,
+      "Nuclear": 0.0071,
+      "Other Fossil": 0.0078,
       "Other Renewables": 0.0002,
-      "Solar": 0.0031,
-      "Wind": 0.0375
+      "Solar": 0.0041,
+      "Wind": 0.0364
     }
   },
   "RU": {
@@ -11208,14 +11208,14 @@
       "Wind": 0.0039
     },
     "2024": {
-      "Bioenergy": 0.0008,
-      "Coal": 0.1649,
-      "Gas": 0.4577,
-      "Hydro": 0.1827,
-      "Nuclear": 0.1773,
-      "Other Fossil": 0.0102,
+      "Bioenergy": 0.0007,
+      "Coal": 0.1626,
+      "Gas": 0.4514,
+      "Hydro": 0.1898,
+      "Nuclear": 0.1788,
+      "Other Fossil": 0.01,
       "Other Renewables": 0,
-      "Solar": 0.0017,
+      "Solar": 0.0019,
       "Wind": 0.0048
     }
   },
@@ -11616,15 +11616,15 @@
       "Wind": 0.2198
     },
     "2024": {
-      "Bioenergy": 0.046,
+      "Bioenergy": 0.0444,
       "Coal": 0,
       "Gas": 0,
-      "Hydro": 0.4179,
-      "Nuclear": 0.2999,
+      "Hydro": 0.4166,
+      "Nuclear": 0.3028,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0108,
-      "Wind": 0.2254
+      "Solar": 0.0131,
+      "Wind": 0.2232
     }
   },
   "SG": {
@@ -11686,12 +11686,12 @@
     "2024": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.9539,
+      "Gas": 0.9535,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": 0.0232,
+      "Other Fossil": 0.0233,
       "Other Renewables": 0,
-      "Solar": 0.0229,
+      "Solar": 0.023,
       "Wind": 0
     }
   },
@@ -11820,15 +11820,15 @@
       "Wind": 0.0058
     },
     "2024": {
-      "Bioenergy": 0.009,
-      "Coal": 0.1998,
-      "Gas": 0.0354,
-      "Hydro": 0.3827,
-      "Nuclear": 0.3267,
-      "Other Fossil": 0.0044,
+      "Bioenergy": 0.0088,
+      "Coal": 0.1964,
+      "Gas": 0.0331,
+      "Hydro": 0.3851,
+      "Nuclear": 0.3291,
+      "Other Fossil": 0.0047,
       "Other Renewables": 0.0002,
-      "Solar": 0.0372,
-      "Wind": 0.0047
+      "Solar": 0.0384,
+      "Wind": 0.0042
     }
   },
   "SK": {
@@ -11888,14 +11888,14 @@
       "Wind": 0
     },
     "2024": {
-      "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,
+      "Bioenergy": 0.0338,
+      "Coal": 0.0128,
+      "Gas": 0.0713,
+      "Hydro": 0.2037,
+      "Nuclear": 0.5941,
+      "Other Fossil": 0.0451,
+      "Other Renewables": 0.0169,
+      "Solar": 0.0223,
       "Wind": 0
     }
   },
@@ -12366,12 +12366,12 @@
     "2024": {
       "Bioenergy": 0.1616,
       "Coal": 0.0013,
-      "Gas": 0.2653,
-      "Hydro": 0.1769,
+      "Gas": 0.2654,
+      "Hydro": 0.1768,
       "Nuclear": 0.0007,
       "Other Fossil": 0.0022,
       "Other Renewables": 0.1776,
-      "Solar": 0.1636,
+      "Solar": 0.1635,
       "Wind": 0.051
     }
   },
@@ -12772,15 +12772,15 @@
       "Wind": 0.0263
     },
     "2024": {
-      "Bioenergy": 0.0571,
-      "Coal": 0.2092,
-      "Gas": 0.6193,
-      "Hydro": 0.0447,
+      "Bioenergy": 0.0569,
+      "Coal": 0.208,
+      "Gas": 0.6209,
+      "Hydro": 0.0451,
       "Nuclear": 0.0064,
       "Other Fossil": 0.0008,
       "Other Renewables": 0.0006,
-      "Solar": 0.0378,
-      "Wind": 0.024
+      "Solar": 0.0375,
+      "Wind": 0.0237
     }
   },
   "TJ": {
@@ -13046,13 +13046,13 @@
     "2024": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.9779,
+      "Gas": 0.978,
       "Hydro": 0,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
       "Solar": 0,
-      "Wind": 0.0221
+      "Wind": 0.022
     }
   },
   "TO": {
@@ -13180,15 +13180,15 @@
       "Wind": 0.1063
     },
     "2024": {
-      "Bioenergy": 0.0272,
-      "Coal": 0.3342,
-      "Gas": 0.1361,
-      "Hydro": 0.283,
-      "Nuclear": 0.0005,
-      "Other Fossil": 0.0038,
-      "Other Renewables": 0.0318,
-      "Solar": 0.0736,
-      "Wind": 0.1098
+      "Bioenergy": 0.0269,
+      "Coal": 0.3347,
+      "Gas": 0.1403,
+      "Hydro": 0.2756,
+      "Nuclear": 0.0004,
+      "Other Fossil": 0.0039,
+      "Other Renewables": 0.0308,
+      "Solar": 0.0777,
+      "Wind": 0.1095
     }
   },
   "TT": {
@@ -13588,15 +13588,15 @@
       "Wind": 0.1001
     },
     "2024": {
-      "Bioenergy": 0.0107,
-      "Coal": 0.1436,
-      "Gas": 0.404,
-      "Hydro": 0.0598,
-      "Nuclear": 0.1825,
-      "Other Fossil": 0.008,
-      "Other Renewables": 0.0042,
-      "Solar": 0.0694,
-      "Wind": 0.1179
+      "Bioenergy": 0.0105,
+      "Coal": 0.1456,
+      "Gas": 0.4059,
+      "Hydro": 0.0589,
+      "Nuclear": 0.1804,
+      "Other Fossil": 0.0081,
+      "Other Renewables": 0.0041,
+      "Solar": 0.0717,
+      "Wind": 0.1147
     }
   },
   "UY": {
@@ -13656,15 +13656,15 @@
       "Wind": 0.4065
     },
     "2024": {
-      "Bioenergy": 0.1251,
+      "Bioenergy": 0.1195,
       "Coal": 0,
-      "Gas": 0.0103,
-      "Hydro": 0.5019,
+      "Gas": 0.0087,
+      "Hydro": 0.5086,
       "Nuclear": 0,
-      "Other Fossil": 0.0013,
+      "Other Fossil": 0.0011,
       "Other Renewables": 0,
-      "Solar": 0.0291,
-      "Wind": 0.3324
+      "Solar": 0.0271,
+      "Wind": 0.3349
     }
   },
   "UZ": {
@@ -13725,13 +13725,13 @@
     },
     "2024": {
       "Bioenergy": 0.0004,
-      "Coal": 0.0476,
-      "Gas": 0.8347,
-      "Hydro": 0.1017,
+      "Coal": 0.0475,
+      "Gas": 0.8346,
+      "Hydro": 0.1018,
       "Nuclear": 0.0011,
       "Other Fossil": 0.0111,
       "Other Renewables": 0.0001,
-      "Solar": 0.0017,
+      "Solar": 0.0018,
       "Wind": 0.0016
     }
   },
@@ -14065,14 +14065,14 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Coal": 0.6126,
-      "Gas": 0.093,
-      "Hydro": 0.1598,
+      "Coal": 0.6144,
+      "Gas": 0.0936,
+      "Hydro": 0.1615,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0943,
-      "Wind": 0.0402
+      "Solar": 0.0932,
+      "Wind": 0.0374
     }
   },
   "VU": {
@@ -14268,15 +14268,15 @@
       "Wind": 0.074
     },
     "2024": {
-      "Bioenergy": 0.0024,
-      "Coal": 0.8358,
-      "Gas": 0.0203,
-      "Hydro": 0.0452,
-      "Nuclear": 0.0168,
-      "Other Fossil": 0.0016,
+      "Bioenergy": 0.0022,
+      "Coal": 0.8401,
+      "Gas": 0.0188,
+      "Hydro": 0.0446,
+      "Nuclear": 0.0158,
+      "Other Fossil": 0.0015,
       "Other Renewables": 0.0005,
-      "Solar": 0.0041,
-      "Wind": 0.0733
+      "Solar": 0.0043,
+      "Wind": 0.0723
     }
   },
   "YE": {
@@ -14405,14 +14405,14 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Coal": 0.8123,
-      "Gas": 0.001,
-      "Hydro": 0.0068,
-      "Nuclear": 0.0362,
-      "Other Fossil": 0.016,
+      "Coal": 0.8177,
+      "Gas": 0.0009,
+      "Hydro": 0.0062,
+      "Nuclear": 0.036,
+      "Other Fossil": 0.0146,
       "Other Renewables": 0.0008,
-      "Solar": 0.0816,
-      "Wind": 0.0453
+      "Solar": 0.0792,
+      "Wind": 0.0445
     }
   },
   "ZM": {