npm - @digital4better/data - Versions diffs - 1.3.15 → 1.3.17 - Mend

@digital4better/data 1.3.15 → 1.3.17

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 +114 -114
package/data/factor/continent-monthly-green.json +926 -926
package/data/factor/continent-monthly.csv +108 -108
package/data/factor/continent-monthly.json +886 -886
package/data/factor/continent-yearly-green.csv +16 -16
package/data/factor/continent-yearly-green.json +124 -124
package/data/factor/continent-yearly.csv +15 -15
package/data/factor/continent-yearly.json +122 -122
package/data/factor/country-monthly-green.csv +844 -844
package/data/factor/country-monthly-green.json +7097 -7097
package/data/factor/country-monthly.csv +888 -888
package/data/factor/country-monthly.json +6294 -6294
package/data/factor/country-yearly-green.csv +169 -169
package/data/factor/country-yearly-green.json +1355 -1355
package/data/factor/country-yearly.csv +167 -167
package/data/factor/country-yearly.json +1118 -1118
package/data/factor/subdivision-monthly-green.csv +40 -40
package/data/factor/subdivision-monthly-green.json +360 -360
package/data/factor/subdivision-monthly.csv +40 -40
package/data/factor/subdivision-monthly.json +360 -360
package/data/factor/subdivision-yearly-green.csv +63 -63
package/data/factor/subdivision-yearly-green.json +564 -564
package/data/factor/subdivision-yearly.csv +63 -63
package/data/factor/subdivision-yearly.json +552 -552
package/data/factor/world-monthly-green.csv +60 -60
package/data/factor/world-monthly-green.json +522 -522
package/data/factor/world-monthly.csv +60 -60
package/data/factor/world-monthly.json +504 -504
package/data/factor/world-yearly-green.csv +6 -6
package/data/factor/world-yearly-green.json +52 -52
package/data/factor/world-yearly.csv +6 -6
package/data/factor/world-yearly.json +45 -45
package/data/mix/continent-monthly-green.csv +54 -54
package/data/mix/continent-monthly-green.json +212 -212
package/data/mix/continent-monthly.csv +54 -54
package/data/mix/continent-monthly.json +239 -239
package/data/mix/continent-yearly-green.csv +7 -7
package/data/mix/continent-yearly-green.json +30 -30
package/data/mix/continent-yearly.csv +7 -7
package/data/mix/continent-yearly.json +41 -41
package/data/mix/country-monthly-green.csv +564 -564
package/data/mix/country-monthly-green.json +1802 -1802
package/data/mix/country-monthly.csv +564 -564
package/data/mix/country-monthly.json +2676 -2676
package/data/mix/country-yearly-green.csv +90 -90
package/data/mix/country-yearly-green.json +319 -319
package/data/mix/country-yearly.csv +90 -90
package/data/mix/country-yearly.json +512 -512
package/data/mix/subdivision-monthly-green.csv +40 -40
package/data/mix/subdivision-monthly-green.json +136 -136
package/data/mix/subdivision-monthly.csv +40 -40
package/data/mix/subdivision-monthly.json +259 -259
package/data/mix/subdivision-yearly-green.csv +34 -34
package/data/mix/subdivision-yearly-green.json +71 -71
package/data/mix/subdivision-yearly.csv +34 -34
package/data/mix/subdivision-yearly.json +101 -101
package/data/mix/world-monthly-green.csv +20 -20
package/data/mix/world-monthly-green.json +67 -67
package/data/mix/world-monthly.csv +20 -20
package/data/mix/world-monthly.json +57 -57
package/data/mix/world-yearly-green.csv +1 -1
package/data/mix/world-yearly-green.json +7 -7
package/data/mix/world-yearly.csv +1 -1
package/data/mix/world-yearly.json +6 -6
package/package.json +2 -2

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

@@ -136,25 +136,25 @@
     },
     "2024": {
       "Bioenergy": 0.0162,
-      "Coal": 0.4336,
+      "Coal": 0.4337,
       "Gas": 0.0756,
       "Hydro": 0.2844,
       "Nuclear": 0.0404,
       "Other Fossil": 0.02,
       "Other Renewables": 0.0041,
-      "Solar": 0.069,
-      "Wind": 0.0567
+      "Solar": 0.0689,
+      "Wind": 0.0568
     },
     "2025": {
-      "Bioenergy": 0.0154,
-      "Coal": 0.4098,
+      "Bioenergy": 0.0156,
+      "Coal": 0.4133,
       "Gas": 0.0723,
-      "Hydro": 0.2818,
-      "Nuclear": 0.042,
+      "Hydro": 0.2809,
+      "Nuclear": 0.0415,
       "Other Fossil": 0.0202,
-      "Other Renewables": 0.0043,
-      "Solar": 0.0894,
-      "Wind": 0.0647
+      "Other Renewables": 0.0042,
+      "Solar": 0.0883,
+      "Wind": 0.0638
     }
   },
   "AG": {
@@ -304,15 +304,15 @@
       "Wind": 0.0403
     },
     "2025": {
-      "Bioenergy": 0.0087,
-      "Coal": 0.0398,
-      "Gas": 0.0726,
-      "Hydro": 0.734,
-      "Nuclear": 0.0622,
-      "Other Fossil": 0.007,
+      "Bioenergy": 0.0088,
+      "Coal": 0.0395,
+      "Gas": 0.0727,
+      "Hydro": 0.7338,
+      "Nuclear": 0.0626,
+      "Other Fossil": 0.0063,
       "Other Renewables": 0.0022,
-      "Solar": 0.0368,
-      "Wind": 0.0365
+      "Solar": 0.037,
+      "Wind": 0.037
     }
   },
   "AM": {
@@ -535,21 +535,21 @@
       "Gas": 0.5042,
       "Hydro": 0.2506,
       "Nuclear": 0.072,
-      "Other Fossil": 0.0119,
+      "Other Fossil": 0.0118,
       "Other Renewables": 0.0002,
       "Solar": 0.0288,
       "Wind": 0.1137
     },
     "2025": {
-      "Bioenergy": 0.0102,
-      "Coal": 0.008,
-      "Gas": 0.524,
-      "Hydro": 0.2275,
-      "Nuclear": 0.0693,
-      "Other Fossil": 0.0096,
+      "Bioenergy": 0.0105,
+      "Coal": 0.0084,
+      "Gas": 0.5293,
+      "Hydro": 0.2179,
+      "Nuclear": 0.0703,
+      "Other Fossil": 0.0106,
       "Other Renewables": 0.0002,
-      "Solar": 0.0293,
-      "Wind": 0.122
+      "Solar": 0.0309,
+      "Wind": 0.1221
     }
   },
   "AS": {
@@ -699,15 +699,15 @@
       "Wind": 0.1337
     },
     "2025": {
-      "Bioenergy": 0.0267,
+      "Bioenergy": 0.027,
       "Coal": 0.0081,
-      "Gas": 0.1089,
-      "Hydro": 0.5505,
-      "Nuclear": 0.0112,
+      "Gas": 0.1093,
+      "Hydro": 0.551,
+      "Nuclear": 0.0114,
       "Other Fossil": 0.0157,
       "Other Renewables": 0.0004,
-      "Solar": 0.155,
-      "Wind": 0.1236
+      "Solar": 0.1561,
+      "Wind": 0.121
     }
   },
   "AU": {
@@ -778,15 +778,15 @@
       "Wind": 0.1343
     },
     "2025": {
-      "Bioenergy": 0.0014,
-      "Coal": 0.5305,
-      "Gas": 0.0747,
-      "Hydro": 0.0531,
+      "Bioenergy": 0.0015,
+      "Coal": 0.5274,
+      "Gas": 0.0752,
+      "Hydro": 0.0532,
       "Nuclear": 0,
       "Other Fossil": 0.0001,
       "Other Renewables": 0,
-      "Solar": 0.1866,
-      "Wind": 0.1536
+      "Solar": 0.1914,
+      "Wind": 0.1512
     }
   },
   "AW": {
@@ -1016,14 +1016,14 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Coal": 0.5934,
+      "Coal": 0.6016,
       "Gas": 0,
-      "Hydro": 0.3504,
+      "Hydro": 0.343,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0413,
-      "Wind": 0.0148
+      "Solar": 0.0406,
+      "Wind": 0.0147
     }
   },
   "BB": {
@@ -1158,12 +1158,12 @@
       "Nuclear": 0.0089,
       "Other Fossil": 0.1551,
       "Other Renewables": 0.0009,
-      "Solar": 0.0178,
+      "Solar": 0.0177,
       "Wind": 0.0116
     },
     "2024": {
       "Bioenergy": 0.0033,
-      "Coal": 0.3645,
+      "Coal": 0.3646,
       "Gas": 0.4499,
       "Hydro": 0.0281,
       "Nuclear": 0.0082,
@@ -1174,14 +1174,14 @@
     },
     "2025": {
       "Bioenergy": 0.0033,
-      "Coal": 0.35,
-      "Gas": 0.4493,
-      "Hydro": 0.0249,
-      "Nuclear": 0.0089,
-      "Other Fossil": 0.1187,
+      "Coal": 0.3504,
+      "Gas": 0.4454,
+      "Hydro": 0.0252,
+      "Nuclear": 0.0087,
+      "Other Fossil": 0.1232,
       "Other Renewables": 0.0009,
-      "Solar": 0.0303,
-      "Wind": 0.0138
+      "Solar": 0.0295,
+      "Wind": 0.0134
     }
   },
   "BE": {
@@ -1252,15 +1252,15 @@
       "Wind": 0.1772
     },
     "2025": {
-      "Bioenergy": 0.0125,
-      "Coal": 0.0202,
-      "Gas": 0.2027,
-      "Hydro": 0.0287,
-      "Nuclear": 0.3238,
-      "Other Fossil": 0.0983,
+      "Bioenergy": 0.0129,
+      "Coal": 0.0198,
+      "Gas": 0.1957,
+      "Hydro": 0.0282,
+      "Nuclear": 0.3295,
+      "Other Fossil": 0.0984,
       "Other Renewables": 0.0011,
-      "Solar": 0.1695,
-      "Wind": 0.1431
+      "Solar": 0.1696,
+      "Wind": 0.1448
     }
   },
   "BF": {
@@ -1411,14 +1411,14 @@
     },
     "2025": {
       "Bioenergy": 0.0032,
-      "Coal": 0.2602,
-      "Gas": 0.0499,
-      "Hydro": 0.0743,
-      "Nuclear": 0.3876,
+      "Coal": 0.2583,
+      "Gas": 0.0498,
+      "Hydro": 0.0737,
+      "Nuclear": 0.3979,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.1937,
-      "Wind": 0.031
+      "Solar": 0.1857,
+      "Wind": 0.0312
     }
   },
   "BH": {
@@ -1884,15 +1884,15 @@
       "Wind": 0.0419
     },
     "2025": {
-      "Bioenergy": 0.0079,
+      "Bioenergy": 0.0078,
       "Coal": 0,
-      "Gas": 0.6187,
-      "Hydro": 0.3193,
+      "Gas": 0.6257,
+      "Hydro": 0.3135,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0303,
-      "Wind": 0.0237
+      "Solar": 0.0298,
+      "Wind": 0.0233
     }
   },
   "BR": {
@@ -1952,26 +1952,26 @@
       "Wind": 0.1416
     },
     "2024": {
-      "Bioenergy": 0.0136,
+      "Bioenergy": 0.0134,
       "Coal": 0.0131,
-      "Gas": 0.0651,
-      "Hydro": 0.6148,
+      "Gas": 0.0647,
+      "Hydro": 0.6155,
       "Nuclear": 0.0226,
-      "Other Fossil": 0.0111,
+      "Other Fossil": 0.0108,
       "Other Renewables": 0,
-      "Solar": 0.1066,
-      "Wind": 0.1531
+      "Solar": 0.1067,
+      "Wind": 0.1533
     },
     "2025": {
-      "Bioenergy": 0.0107,
-      "Coal": 0.0115,
-      "Gas": 0.0595,
-      "Hydro": 0.6102,
-      "Nuclear": 0.0208,
-      "Other Fossil": 0.0095,
+      "Bioenergy": 0.0104,
+      "Coal": 0.012,
+      "Gas": 0.0589,
+      "Hydro": 0.6077,
+      "Nuclear": 0.0213,
+      "Other Fossil": 0.0093,
       "Other Renewables": 0,
-      "Solar": 0.1218,
-      "Wind": 0.156
+      "Solar": 0.1229,
+      "Wind": 0.1575
     }
   },
   "BS": {
@@ -2350,7 +2350,7 @@
       "Bioenergy": 0.171,
       "Coal": 0.0159,
       "Gas": 0.1042,
-      "Hydro": 0.5109,
+      "Hydro": 0.511,
       "Nuclear": 0.0092,
       "Other Fossil": 0.1033,
       "Other Renewables": 0.0024,
@@ -2358,15 +2358,15 @@
       "Wind": 0.0412
     },
     "2025": {
-      "Bioenergy": 0.1705,
-      "Coal": 0.0168,
-      "Gas": 0.101,
-      "Hydro": 0.5149,
-      "Nuclear": 0.0078,
-      "Other Fossil": 0.1001,
-      "Other Renewables": 0.0023,
-      "Solar": 0.0443,
-      "Wind": 0.0422
+      "Bioenergy": 0.1704,
+      "Coal": 0.0166,
+      "Gas": 0.1022,
+      "Hydro": 0.5124,
+      "Nuclear": 0.0085,
+      "Other Fossil": 0.1,
+      "Other Renewables": 0.0022,
+      "Solar": 0.0449,
+      "Wind": 0.0428
     }
   },
   "CA": {
@@ -2753,15 +2753,15 @@
       "Wind": 0.0045
     },
     "2025": {
-      "Bioenergy": 0.0014,
+      "Bioenergy": 0.0015,
       "Coal": 0.0075,
-      "Gas": 0.0134,
-      "Hydro": 0.513,
-      "Nuclear": 0.2756,
-      "Other Fossil": 0.0474,
+      "Gas": 0.0135,
+      "Hydro": 0.511,
+      "Nuclear": 0.2774,
+      "Other Fossil": 0.0481,
       "Other Renewables": 0.0004,
-      "Solar": 0.1328,
-      "Wind": 0.0086
+      "Solar": 0.1321,
+      "Wind": 0.0087
     }
   },
   "CI": {
@@ -2990,15 +2990,15 @@
       "Wind": 0.1296
     },
     "2025": {
-      "Bioenergy": 0.0246,
-      "Coal": 0.1842,
-      "Gas": 0.1879,
-      "Hydro": 0.2326,
+      "Bioenergy": 0.025,
+      "Coal": 0.1793,
+      "Gas": 0.1832,
+      "Hydro": 0.241,
       "Nuclear": 0,
-      "Other Fossil": 0.0167,
+      "Other Fossil": 0.0161,
       "Other Renewables": 0.0014,
-      "Solar": 0.2111,
-      "Wind": 0.1413
+      "Solar": 0.2148,
+      "Wind": 0.1393
     }
   },
   "CM": {
@@ -3221,7 +3221,7 @@
       "Gas": 0.0887,
       "Hydro": 0.7128,
       "Nuclear": 0.0023,
-      "Other Fossil": 0.0134,
+      "Other Fossil": 0.0133,
       "Other Renewables": 0.0006,
       "Solar": 0.0484,
       "Wind": 0.0126
@@ -3309,12 +3309,12 @@
       "Bioenergy": 0.0045,
       "Coal": 0.0003,
       "Gas": 0.0023,
-      "Hydro": 0.7387,
+      "Hydro": 0.7398,
       "Nuclear": 0.0002,
       "Other Fossil": 0.0157,
-      "Other Renewables": 0.1035,
+      "Other Renewables": 0.1067,
       "Solar": 0.0009,
-      "Wind": 0.1337
+      "Wind": 0.1294
     }
   },
   "CU": {
@@ -3622,14 +3622,14 @@
       "Wind": 0.0103
     },
     "2025": {
-      "Bioenergy": 0.0406,
-      "Coal": 0.3318,
-      "Gas": 0.0609,
-      "Hydro": 0.0252,
-      "Nuclear": 0.4092,
-      "Other Fossil": 0.0094,
-      "Other Renewables": 0.0328,
-      "Solar": 0.0822,
+      "Bioenergy": 0.0411,
+      "Coal": 0.3237,
+      "Gas": 0.0578,
+      "Hydro": 0.025,
+      "Nuclear": 0.4201,
+      "Other Fossil": 0.0093,
+      "Other Renewables": 0.0326,
+      "Solar": 0.0825,
       "Wind": 0.008
     }
   },
@@ -3701,15 +3701,15 @@
       "Wind": 0.2733
     },
     "2025": {
-      "Bioenergy": 0.0805,
-      "Coal": 0.2035,
-      "Gas": 0.1639,
-      "Hydro": 0.0444,
-      "Nuclear": 0.008,
-      "Other Fossil": 0.0589,
+      "Bioenergy": 0.0846,
+      "Coal": 0.1991,
+      "Gas": 0.1688,
+      "Hydro": 0.0464,
+      "Nuclear": 0.0085,
+      "Other Fossil": 0.0364,
       "Other Renewables": 0.0003,
-      "Solar": 0.211,
-      "Wind": 0.2293
+      "Solar": 0.2197,
+      "Wind": 0.2362
     }
   },
   "DJ": {
@@ -3859,15 +3859,15 @@
       "Wind": 0.5432
     },
     "2025": {
-      "Bioenergy": 0.0868,
-      "Coal": 0.0857,
-      "Gas": 0.0892,
-      "Hydro": 0.0342,
-      "Nuclear": 0.0393,
-      "Other Fossil": 0.0385,
+      "Bioenergy": 0.0871,
+      "Coal": 0.0853,
+      "Gas": 0.0889,
+      "Hydro": 0.0343,
+      "Nuclear": 0.04,
+      "Other Fossil": 0.0375,
       "Other Renewables": 0.0014,
-      "Solar": 0.1606,
-      "Wind": 0.4642
+      "Solar": 0.1584,
+      "Wind": 0.467
     }
   },
   "DM": {
@@ -4178,12 +4178,12 @@
       "Bioenergy": 0.0002,
       "Coal": 0.001,
       "Gas": 0.0339,
-      "Hydro": 0.7216,
-      "Nuclear": 0.0005,
+      "Hydro": 0.7215,
+      "Nuclear": 0.0006,
       "Other Fossil": 0.2346,
       "Other Renewables": 0.0001,
-      "Solar": 0.0021,
-      "Wind": 0.0058
+      "Solar": 0.0022,
+      "Wind": 0.0059
     }
   },
   "EE": {
@@ -4254,15 +4254,15 @@
       "Wind": 0.2013
     },
     "2025": {
-      "Bioenergy": 0.0664,
-      "Coal": 0.0434,
-      "Gas": 0.0792,
-      "Hydro": 0.0559,
-      "Nuclear": 0.0665,
-      "Other Fossil": 0.2697,
-      "Other Renewables": 0.0023,
-      "Solar": 0.2139,
-      "Wind": 0.2027
+      "Bioenergy": 0.0668,
+      "Coal": 0.0442,
+      "Gas": 0.0814,
+      "Hydro": 0.0571,
+      "Nuclear": 0.0689,
+      "Other Fossil": 0.2673,
+      "Other Renewables": 0.0024,
+      "Solar": 0.2096,
+      "Wind": 0.2023
     }
   },
   "EG": {
@@ -4491,15 +4491,15 @@
       "Wind": 0.2368
     },
     "2025": {
-      "Bioenergy": 0.014,
+      "Bioenergy": 0.0141,
       "Coal": 0.0071,
-      "Gas": 0.1823,
-      "Hydro": 0.1307,
-      "Nuclear": 0.2003,
+      "Gas": 0.1838,
+      "Hydro": 0.1311,
+      "Nuclear": 0.2025,
       "Other Fossil": 0.007,
       "Other Renewables": 0.0023,
-      "Solar": 0.2478,
-      "Wind": 0.2085
+      "Solar": 0.2462,
+      "Wind": 0.2058
     }
   },
   "ET": {
@@ -4649,15 +4649,15 @@
       "Wind": 0.2352
     },
     "2025": {
-      "Bioenergy": 0.1163,
-      "Coal": 0.0162,
-      "Gas": 0.0254,
-      "Hydro": 0.1632,
-      "Nuclear": 0.3727,
-      "Other Fossil": 0.0418,
-      "Other Renewables": 0.0031,
-      "Solar": 0.0275,
-      "Wind": 0.2339
+      "Bioenergy": 0.1165,
+      "Coal": 0.0167,
+      "Gas": 0.0262,
+      "Hydro": 0.1618,
+      "Nuclear": 0.3681,
+      "Other Fossil": 0.0411,
+      "Other Renewables": 0.0029,
+      "Solar": 0.0273,
+      "Wind": 0.2394
     }
   },
   "FJ": {
@@ -4967,13 +4967,13 @@
     "2025": {
       "Bioenergy": 0.0054,
       "Coal": 0.002,
-      "Gas": 0.0321,
-      "Hydro": 0.1033,
-      "Nuclear": 0.6988,
+      "Gas": 0.0323,
+      "Hydro": 0.1031,
+      "Nuclear": 0.7,
       "Other Fossil": 0.0078,
       "Other Renewables": 0,
-      "Solar": 0.0662,
-      "Wind": 0.0843
+      "Solar": 0.0654,
+      "Wind": 0.0839
     }
   },
   "GA": {
@@ -5123,15 +5123,15 @@
       "Wind": 0.3183
     },
     "2025": {
-      "Bioenergy": 0.0769,
-      "Coal": 0.0151,
-      "Gas": 0.3201,
-      "Hydro": 0.0305,
-      "Nuclear": 0.164,
-      "Other Fossil": 0.0194,
+      "Bioenergy": 0.0764,
+      "Coal": 0.0148,
+      "Gas": 0.3184,
+      "Hydro": 0.0303,
+      "Nuclear": 0.1596,
+      "Other Fossil": 0.0191,
       "Other Renewables": 0.0008,
-      "Solar": 0.0955,
-      "Wind": 0.2775
+      "Solar": 0.0946,
+      "Wind": 0.2859
     }
   },
   "GD": {
@@ -5993,14 +5993,14 @@
     },
     "2025": {
       "Bioenergy": 0.0005,
-      "Coal": 0.061,
-      "Gas": 0.4128,
-      "Hydro": 0.0509,
-      "Nuclear": 0.0031,
-      "Other Fossil": 0.0004,
+      "Coal": 0.0542,
+      "Gas": 0.4126,
+      "Hydro": 0.0491,
+      "Nuclear": 0.0032,
+      "Other Fossil": 0.0003,
       "Other Renewables": 0.0001,
-      "Solar": 0.2848,
-      "Wind": 0.1863
+      "Solar": 0.2831,
+      "Wind": 0.1968
     }
   },
   "GT": {
@@ -6372,7 +6372,7 @@
       "Nuclear": 0.0134,
       "Other Fossil": 0.0054,
       "Other Renewables": 0.0013,
-      "Solar": 0.0159,
+      "Solar": 0.0158,
       "Wind": 0.0176
     },
     "2024": {
@@ -6383,19 +6383,19 @@
       "Nuclear": 0.0131,
       "Other Fossil": 0.0051,
       "Other Renewables": 0.0013,
-      "Solar": 0.0198,
+      "Solar": 0.0197,
       "Wind": 0.0185
     },
     "2025": {
       "Bioenergy": 0.0079,
-      "Coal": 0.5564,
+      "Coal": 0.5575,
       "Gas": 0.3386,
-      "Hydro": 0.0294,
-      "Nuclear": 0.0137,
+      "Hydro": 0.0291,
+      "Nuclear": 0.0135,
       "Other Fossil": 0.0051,
       "Other Renewables": 0.0014,
-      "Solar": 0.0264,
-      "Wind": 0.0211
+      "Solar": 0.0261,
+      "Wind": 0.0208
     }
   },
   "HN": {
@@ -6468,12 +6468,12 @@
     "2025": {
       "Bioenergy": 0.1282,
       "Coal": 0.0053,
-      "Gas": 0.0052,
-      "Hydro": 0.2231,
+      "Gas": 0.0053,
+      "Hydro": 0.223,
       "Nuclear": 0.0004,
       "Other Fossil": 0.4371,
       "Other Renewables": 0.0264,
-      "Solar": 0.0999,
+      "Solar": 0.1,
       "Wind": 0.0741
     }
   },
@@ -6545,15 +6545,15 @@
       "Wind": 0.1733
     },
     "2025": {
-      "Bioenergy": 0.0386,
-      "Coal": 0.0518,
-      "Gas": 0.1893,
-      "Hydro": 0.3184,
-      "Nuclear": 0.0627,
-      "Other Fossil": 0.01,
-      "Other Renewables": 0.0172,
-      "Solar": 0.1166,
-      "Wind": 0.1953
+      "Bioenergy": 0.0396,
+      "Coal": 0.0508,
+      "Gas": 0.1882,
+      "Hydro": 0.3178,
+      "Nuclear": 0.062,
+      "Other Fossil": 0.0094,
+      "Other Renewables": 0.0165,
+      "Solar": 0.1158,
+      "Wind": 0.1998
     }
   },
   "HT": {
@@ -6704,14 +6704,14 @@
     },
     "2025": {
       "Bioenergy": 0.0358,
-      "Coal": 0.0576,
-      "Gas": 0.1827,
-      "Hydro": 0.0332,
-      "Nuclear": 0.3616,
-      "Other Fossil": 0.0175,
-      "Other Renewables": 0.0038,
-      "Solar": 0.2741,
-      "Wind": 0.0338
+      "Coal": 0.0565,
+      "Gas": 0.1752,
+      "Hydro": 0.0328,
+      "Nuclear": 0.3524,
+      "Other Fossil": 0.016,
+      "Other Renewables": 0.0037,
+      "Solar": 0.2943,
+      "Wind": 0.0332
     }
   },
   "ID": {
@@ -6851,25 +6851,25 @@
     },
     "2024": {
       "Bioenergy": 0.0079,
-      "Coal": 0.0483,
-      "Gas": 0.4406,
-      "Hydro": 0.0501,
+      "Coal": 0.0482,
+      "Gas": 0.4403,
+      "Hydro": 0.05,
       "Nuclear": 0.0318,
       "Other Fossil": 0.0388,
       "Other Renewables": 0.0011,
-      "Solar": 0.0331,
-      "Wind": 0.3483
+      "Solar": 0.0333,
+      "Wind": 0.3486
     },
     "2025": {
-      "Bioenergy": 0.0091,
-      "Coal": 0.0473,
-      "Gas": 0.4118,
-      "Hydro": 0.0494,
-      "Nuclear": 0.0406,
-      "Other Fossil": 0.0394,
+      "Bioenergy": 0.0087,
+      "Coal": 0.0425,
+      "Gas": 0.4414,
+      "Hydro": 0.0465,
+      "Nuclear": 0.0377,
+      "Other Fossil": 0.0375,
       "Other Renewables": 0.0014,
-      "Solar": 0.0604,
-      "Wind": 0.3405
+      "Solar": 0.0597,
+      "Wind": 0.3247
     }
   },
   "IL": {
@@ -7019,15 +7019,15 @@
       "Wind": 0.0452
     },
     "2025": {
-      "Bioenergy": 0.0067,
-      "Coal": 0.7127,
-      "Gas": 0.0156,
-      "Hydro": 0.0794,
-      "Nuclear": 0.0311,
-      "Other Fossil": 0.002,
+      "Bioenergy": 0.0081,
+      "Coal": 0.7021,
+      "Gas": 0.015,
+      "Hydro": 0.0907,
+      "Nuclear": 0.0297,
+      "Other Fossil": 0.0002,
       "Other Renewables": 0.0016,
-      "Solar": 0.0891,
-      "Wind": 0.0619
+      "Solar": 0.0869,
+      "Wind": 0.0657
     }
   },
   "IQ": {
@@ -7335,14 +7335,14 @@
       "Wind": 0.0964
     },
     "2025": {
-      "Bioenergy": 0.0489,
-      "Coal": 0.0318,
-      "Gas": 0.4191,
-      "Hydro": 0.1419,
-      "Nuclear": 0.0333,
-      "Other Fossil": 0.0209,
-      "Other Renewables": 0.0191,
-      "Solar": 0.1892,
+      "Bioenergy": 0.0501,
+      "Coal": 0.032,
+      "Gas": 0.4169,
+      "Hydro": 0.1418,
+      "Nuclear": 0.0329,
+      "Other Fossil": 0.0206,
+      "Other Renewables": 0.0196,
+      "Solar": 0.1905,
       "Wind": 0.0957
     }
   },
@@ -7572,15 +7572,15 @@
       "Wind": 0.0198
     },
     "2025": {
-      "Bioenergy": 0.0649,
-      "Coal": 0.2616,
-      "Gas": 0.2872,
-      "Hydro": 0.0861,
-      "Nuclear": 0.1033,
-      "Other Fossil": 0.0338,
-      "Other Renewables": 0.0114,
-      "Solar": 0.1262,
-      "Wind": 0.0254
+      "Bioenergy": 0.0625,
+      "Coal": 0.2722,
+      "Gas": 0.2922,
+      "Hydro": 0.0771,
+      "Nuclear": 0.0989,
+      "Other Fossil": 0.0358,
+      "Other Renewables": 0.0109,
+      "Solar": 0.1266,
+      "Wind": 0.0239
     }
   },
   "KE": {
@@ -7651,15 +7651,15 @@
       "Wind": 0.1313
     },
     "2025": {
-      "Bioenergy": 0.0261,
-      "Coal": 0.0301,
-      "Gas": 0.0412,
-      "Hydro": 0.2668,
+      "Bioenergy": 0.0233,
+      "Coal": 0.0305,
+      "Gas": 0.0418,
+      "Hydro": 0.2553,
       "Nuclear": 0.0015,
-      "Other Fossil": 0.0876,
-      "Other Renewables": 0.3973,
-      "Solar": 0.0341,
-      "Wind": 0.1153
+      "Other Fossil": 0.0796,
+      "Other Renewables": 0.4035,
+      "Solar": 0.0315,
+      "Wind": 0.1327
     }
   },
   "KG": {
@@ -7731,13 +7731,13 @@
     },
     "2025": {
       "Bioenergy": 0.0015,
-      "Coal": 0.0962,
+      "Coal": 0.0965,
       "Gas": 0.0152,
-      "Hydro": 0.8352,
-      "Nuclear": 0.0041,
+      "Hydro": 0.8351,
+      "Nuclear": 0.004,
       "Other Fossil": 0.0335,
       "Other Renewables": 0.0004,
-      "Solar": 0.0077,
+      "Solar": 0.0076,
       "Wind": 0.0062
     }
   },
@@ -7809,15 +7809,15 @@
       "Wind": 0.0186
     },
     "2025": {
-      "Bioenergy": 0.0133,
-      "Coal": 0.4551,
+      "Bioenergy": 0.0134,
+      "Coal": 0.4562,
       "Gas": 0.0237,
-      "Hydro": 0.38,
-      "Nuclear": 0.0138,
+      "Hydro": 0.3797,
+      "Nuclear": 0.0136,
       "Other Fossil": 0.0552,
       "Other Renewables": 0.0014,
-      "Solar": 0.0362,
-      "Wind": 0.0212
+      "Solar": 0.0358,
+      "Wind": 0.0209
     }
   },
   "KI": {
@@ -8994,15 +8994,15 @@
       "Wind": 0.3147
     },
     "2025": {
-      "Bioenergy": 0.0197,
-      "Coal": 0.0356,
-      "Gas": 0.2039,
-      "Hydro": 0.0661,
-      "Nuclear": 0.053,
-      "Other Fossil": 0.099,
+      "Bioenergy": 0.0198,
+      "Coal": 0.0347,
+      "Gas": 0.2016,
+      "Hydro": 0.0666,
+      "Nuclear": 0.0525,
+      "Other Fossil": 0.1003,
       "Other Renewables": 0.0018,
-      "Solar": 0.1991,
-      "Wind": 0.3217
+      "Solar": 0.1949,
+      "Wind": 0.3277
     }
   },
   "LU": {
@@ -9073,15 +9073,15 @@
       "Wind": 0.1855
     },
     "2025": {
-      "Bioenergy": 0.0657,
-      "Coal": 0.0912,
-      "Gas": 0.1784,
-      "Hydro": 0.1284,
-      "Nuclear": 0.1404,
-      "Other Fossil": 0.0405,
+      "Bioenergy": 0.0696,
+      "Coal": 0.0901,
+      "Gas": 0.1781,
+      "Hydro": 0.1276,
+      "Nuclear": 0.1406,
+      "Other Fossil": 0.0391,
       "Other Renewables": 0.005,
-      "Solar": 0.1812,
-      "Wind": 0.1691
+      "Solar": 0.1822,
+      "Wind": 0.1678
     }
   },
   "LV": {
@@ -9152,15 +9152,15 @@
       "Wind": 0.0672
     },
     "2025": {
-      "Bioenergy": 0.0567,
-      "Coal": 0.0165,
-      "Gas": 0.2318,
-      "Hydro": 0.4934,
-      "Nuclear": 0.027,
-      "Other Fossil": 0.0117,
+      "Bioenergy": 0.0583,
+      "Coal": 0.0169,
+      "Gas": 0.2298,
+      "Hydro": 0.4784,
+      "Nuclear": 0.0281,
+      "Other Fossil": 0.0114,
       "Other Renewables": 0.001,
-      "Solar": 0.1185,
-      "Wind": 0.0432
+      "Solar": 0.1327,
+      "Wind": 0.0434
     }
   },
   "LY": {
@@ -9394,7 +9394,7 @@
       "Gas": 0.9215,
       "Hydro": 0.0452,
       "Nuclear": 0.0041,
-      "Other Fossil": 0.0005,
+      "Other Fossil": 0.0004,
       "Other Renewables": 0.0001,
       "Solar": 0.0231,
       "Wind": 0.0024
@@ -9468,15 +9468,15 @@
       "Wind": 0.0916
     },
     "2025": {
-      "Bioenergy": 0.0142,
-      "Coal": 0.1934,
-      "Gas": 0.1141,
-      "Hydro": 0.3364,
-      "Nuclear": 0.1026,
-      "Other Fossil": 0.0112,
-      "Other Renewables": 0.0037,
-      "Solar": 0.0989,
-      "Wind": 0.1254
+      "Bioenergy": 0.0139,
+      "Coal": 0.1957,
+      "Gas": 0.1095,
+      "Hydro": 0.3428,
+      "Nuclear": 0.0997,
+      "Other Fossil": 0.0101,
+      "Other Renewables": 0.0036,
+      "Solar": 0.0975,
+      "Wind": 0.1273
     }
   },
   "MG": {
@@ -9626,15 +9626,15 @@
       "Wind": 0.0428
     },
     "2025": {
-      "Bioenergy": 0.0079,
-      "Coal": 0.4018,
+      "Bioenergy": 0.008,
+      "Coal": 0.4016,
       "Gas": 0.2653,
-      "Hydro": 0.1718,
-      "Nuclear": 0.0456,
-      "Other Fossil": 0.0051,
+      "Hydro": 0.1717,
+      "Nuclear": 0.0459,
+      "Other Fossil": 0.0046,
       "Other Renewables": 0.0016,
-      "Solar": 0.0491,
-      "Wind": 0.0518
+      "Solar": 0.0492,
+      "Wind": 0.0521
     }
   },
   "ML": {
@@ -9905,12 +9905,12 @@
       "Nuclear": 0.0457,
       "Other Fossil": 0.0374,
       "Other Renewables": 0.0043,
-      "Solar": 0.0359,
+      "Solar": 0.0358,
       "Wind": 0.0487
     },
     "2022": {
       "Bioenergy": 0.0558,
-      "Coal": 0.4792,
+      "Coal": 0.4793,
       "Gas": 0.1677,
       "Hydro": 0.1117,
       "Nuclear": 0.0455,
@@ -9920,37 +9920,37 @@
       "Wind": 0.0542
     },
     "2023": {
-      "Bioenergy": 0.0564,
+      "Bioenergy": 0.0565,
       "Coal": 0.482,
       "Gas": 0.1637,
       "Hydro": 0.0997,
       "Nuclear": 0.0457,
       "Other Fossil": 0.0353,
       "Other Renewables": 0.0044,
-      "Solar": 0.0528,
+      "Solar": 0.0527,
       "Wind": 0.06
     },
     "2024": {
       "Bioenergy": 0.0558,
-      "Coal": 0.4674,
-      "Gas": 0.1612,
+      "Coal": 0.4675,
+      "Gas": 0.1613,
       "Hydro": 0.1031,
       "Nuclear": 0.0448,
       "Other Fossil": 0.034,
       "Other Renewables": 0.0045,
-      "Solar": 0.0661,
+      "Solar": 0.066,
       "Wind": 0.063
     },
     "2025": {
-      "Bioenergy": 0.0549,
-      "Coal": 0.441,
-      "Gas": 0.1576,
-      "Hydro": 0.1002,
-      "Nuclear": 0.0466,
+      "Bioenergy": 0.0551,
+      "Coal": 0.4449,
+      "Gas": 0.1575,
+      "Hydro": 0.0992,
+      "Nuclear": 0.0461,
       "Other Fossil": 0.0342,
-      "Other Renewables": 0.0048,
-      "Solar": 0.0888,
-      "Wind": 0.0719
+      "Other Renewables": 0.0046,
+      "Solar": 0.0876,
+      "Wind": 0.0708
     }
   },
   "MQ": {
@@ -10258,15 +10258,15 @@
       "Wind": 0.0281
     },
     "2025": {
-      "Bioenergy": 0.0061,
-      "Coal": 0.0283,
+      "Bioenergy": 0.0062,
+      "Coal": 0.0281,
       "Gas": 0.6724,
-      "Hydro": 0.0373,
-      "Nuclear": 0.0439,
-      "Other Fossil": 0.0124,
+      "Hydro": 0.0372,
+      "Nuclear": 0.0442,
+      "Other Fossil": 0.0119,
       "Other Renewables": 0.0016,
-      "Solar": 0.172,
-      "Wind": 0.026
+      "Solar": 0.1722,
+      "Wind": 0.0263
     }
   },
   "MU": {
@@ -10653,14 +10653,14 @@
       "Wind": 0
     },
     "2025": {
-      "Bioenergy": 0.0242,
-      "Coal": 0.4576,
-      "Gas": 0.3131,
-      "Hydro": 0.1801,
+      "Bioenergy": 0.0246,
+      "Coal": 0.4559,
+      "Gas": 0.3122,
+      "Hydro": 0.183,
       "Nuclear": 0,
-      "Other Fossil": 0.0064,
+      "Other Fossil": 0.0057,
       "Other Renewables": 0,
-      "Solar": 0.0186,
+      "Solar": 0.0185,
       "Wind": 0
     }
   },
@@ -11119,7 +11119,7 @@
       "Bioenergy": 0.1685,
       "Coal": 0.0032,
       "Gas": 0.0212,
-      "Hydro": 0.0842,
+      "Hydro": 0.0843,
       "Nuclear": 0.0019,
       "Other Fossil": 0.3984,
       "Other Renewables": 0.1562,
@@ -11129,13 +11129,13 @@
     "2025": {
       "Bioenergy": 0.1684,
       "Coal": 0.0034,
-      "Gas": 0.0205,
-      "Hydro": 0.0851,
-      "Nuclear": 0.0016,
+      "Gas": 0.0208,
+      "Hydro": 0.0845,
+      "Nuclear": 0.0017,
       "Other Fossil": 0.3977,
-      "Other Renewables": 0.1562,
-      "Solar": 0.0128,
-      "Wind": 0.1543
+      "Other Renewables": 0.1561,
+      "Solar": 0.0129,
+      "Wind": 0.1544
     }
   },
   "NL": {
@@ -11206,15 +11206,15 @@
       "Wind": 0.2649
     },
     "2025": {
-      "Bioenergy": 0.0474,
-      "Coal": 0.0696,
-      "Gas": 0.3337,
+      "Bioenergy": 0.0482,
+      "Coal": 0.0723,
+      "Gas": 0.3312,
       "Hydro": 0.0003,
-      "Nuclear": 0.0263,
-      "Other Fossil": 0.0223,
-      "Other Renewables": 0.0139,
-      "Solar": 0.283,
-      "Wind": 0.2036
+      "Nuclear": 0.0262,
+      "Other Fossil": 0.0222,
+      "Other Renewables": 0.0138,
+      "Solar": 0.28,
+      "Wind": 0.2057
     }
   },
   "NO": {
@@ -11287,13 +11287,13 @@
     "2025": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.0054,
-      "Hydro": 0.9155,
+      "Gas": 0.0058,
+      "Hydro": 0.9098,
       "Nuclear": 0,
       "Other Fossil": 0.0017,
       "Other Renewables": 0.0032,
       "Solar": 0,
-      "Wind": 0.0741
+      "Wind": 0.0796
     }
   },
   "NP": {
@@ -11355,7 +11355,7 @@
     "2024": {
       "Bioenergy": 0.0044,
       "Coal": 0.1139,
-      "Gas": 0.0204,
+      "Gas": 0.0205,
       "Hydro": 0.8051,
       "Nuclear": 0.0109,
       "Other Fossil": 0.0012,
@@ -11365,14 +11365,14 @@
     },
     "2025": {
       "Bioenergy": 0.0042,
-      "Coal": 0.1075,
-      "Gas": 0.0196,
-      "Hydro": 0.8044,
-      "Nuclear": 0.0114,
+      "Coal": 0.1084,
+      "Gas": 0.0195,
+      "Hydro": 0.8041,
+      "Nuclear": 0.0112,
       "Other Fossil": 0.0012,
-      "Other Renewables": 0.0012,
-      "Solar": 0.0319,
-      "Wind": 0.0188
+      "Other Renewables": 0.0011,
+      "Solar": 0.0316,
+      "Wind": 0.0185
     }
   },
   "NR": {
@@ -12075,15 +12075,15 @@
       "Wind": 0.01
     },
     "2025": {
-      "Bioenergy": 0.011,
-      "Coal": 0.5958,
-      "Gas": 0.1734,
-      "Hydro": 0.0938,
+      "Bioenergy": 0.0105,
+      "Coal": 0.5716,
+      "Gas": 0.1795,
+      "Hydro": 0.1039,
       "Nuclear": 0,
-      "Other Fossil": 0.0037,
-      "Other Renewables": 0.0777,
-      "Solar": 0.0378,
-      "Wind": 0.0067
+      "Other Fossil": 0.005,
+      "Other Renewables": 0.082,
+      "Solar": 0.0388,
+      "Wind": 0.0087
     }
   },
   "PK": {
@@ -12101,68 +12101,68 @@
     "2020": {
       "Bioenergy": 0.0051,
       "Coal": 0.2023,
-      "Gas": 0.3071,
-      "Hydro": 0.3165,
-      "Nuclear": 0.0742,
+      "Gas": 0.3072,
+      "Hydro": 0.3166,
+      "Nuclear": 0.0743,
       "Other Fossil": 0.0404,
       "Other Renewables": 0,
-      "Solar": 0.0326,
+      "Solar": 0.0324,
       "Wind": 0.0216
     },
     "2021": {
       "Bioenergy": 0.0051,
-      "Coal": 0.193,
-      "Gas": 0.282,
-      "Hydro": 0.2688,
-      "Nuclear": 0.1108,
-      "Other Fossil": 0.0728,
+      "Coal": 0.1933,
+      "Gas": 0.2825,
+      "Hydro": 0.2693,
+      "Nuclear": 0.1109,
+      "Other Fossil": 0.073,
       "Other Renewables": 0,
-      "Solar": 0.043,
+      "Solar": 0.0414,
       "Wind": 0.0245
     },
     "2022": {
-      "Bioenergy": 0.0062,
-      "Coal": 0.1645,
-      "Gas": 0.2636,
-      "Hydro": 0.2435,
-      "Nuclear": 0.1541,
-      "Other Fossil": 0.079,
+      "Bioenergy": 0.0063,
+      "Coal": 0.165,
+      "Gas": 0.2645,
+      "Hydro": 0.2442,
+      "Nuclear": 0.1546,
+      "Other Fossil": 0.0792,
       "Other Renewables": 0,
-      "Solar": 0.0567,
-      "Wind": 0.0324
+      "Solar": 0.0538,
+      "Wind": 0.0325
     },
     "2023": {
       "Bioenergy": 0.0054,
-      "Coal": 0.1615,
-      "Gas": 0.2603,
-      "Hydro": 0.2737,
-      "Nuclear": 0.1594,
-      "Other Fossil": 0.023,
+      "Coal": 0.1622,
+      "Gas": 0.2615,
+      "Hydro": 0.275,
+      "Nuclear": 0.1602,
+      "Other Fossil": 0.0231,
       "Other Renewables": 0,
-      "Solar": 0.0854,
-      "Wind": 0.0312
+      "Solar": 0.0813,
+      "Wind": 0.0313
     },
     "2024": {
-      "Bioenergy": 0.0056,
-      "Coal": 0.1433,
-      "Gas": 0.2439,
-      "Hydro": 0.2702,
-      "Nuclear": 0.159,
-      "Other Fossil": 0.0096,
+      "Bioenergy": 0.0057,
+      "Coal": 0.1442,
+      "Gas": 0.2453,
+      "Hydro": 0.2718,
+      "Nuclear": 0.1599,
+      "Other Fossil": 0.0097,
       "Other Renewables": 0,
-      "Solar": 0.144,
-      "Wind": 0.0244
+      "Solar": 0.139,
+      "Wind": 0.0245
     },
     "2025": {
-      "Bioenergy": 0.0035,
-      "Coal": 0.1694,
-      "Gas": 0.2043,
-      "Hydro": 0.2505,
-      "Nuclear": 0.1302,
-      "Other Fossil": 0.006,
+      "Bioenergy": 0.0037,
+      "Coal": 0.1644,
+      "Gas": 0.2106,
+      "Hydro": 0.253,
+      "Nuclear": 0.1307,
+      "Other Fossil": 0.0053,
       "Other Renewables": 0,
-      "Solar": 0.2079,
-      "Wind": 0.0281
+      "Solar": 0.2011,
+      "Wind": 0.0312
     }
   },
   "PL": {
@@ -12233,15 +12233,15 @@
       "Wind": 0.1506
     },
     "2025": {
-      "Bioenergy": 0.0173,
-      "Coal": 0.5117,
-      "Gas": 0.1235,
-      "Hydro": 0.011,
-      "Nuclear": 0.0018,
-      "Other Fossil": 0.0524,
+      "Bioenergy": 0.0184,
+      "Coal": 0.5083,
+      "Gas": 0.1231,
+      "Hydro": 0.0112,
+      "Nuclear": 0.0021,
+      "Other Fossil": 0.0527,
       "Other Renewables": 0.0033,
-      "Solar": 0.1465,
-      "Wind": 0.1325
+      "Solar": 0.1476,
+      "Wind": 0.1333
     }
   },
   "PM": {
@@ -12392,14 +12392,14 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Coal": 0.2172,
-      "Gas": 0.4276,
+      "Coal": 0.2053,
+      "Gas": 0.4008,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": 0.3254,
+      "Other Fossil": 0.3617,
       "Other Renewables": 0,
-      "Solar": 0.0149,
-      "Wind": 0.0149
+      "Solar": 0.0147,
+      "Wind": 0.0176
     }
   },
   "PS": {
@@ -12549,15 +12549,15 @@
       "Wind": 0.2925
     },
     "2025": {
-      "Bioenergy": 0.0541,
-      "Coal": 0.0178,
-      "Gas": 0.1674,
-      "Hydro": 0.2729,
-      "Nuclear": 0.0288,
-      "Other Fossil": 0.0069,
+      "Bioenergy": 0.0553,
+      "Coal": 0.0173,
+      "Gas": 0.1675,
+      "Hydro": 0.2763,
+      "Nuclear": 0.0286,
+      "Other Fossil": 0.0067,
       "Other Renewables": 0.001,
-      "Solar": 0.1913,
-      "Wind": 0.2598
+      "Solar": 0.1907,
+      "Wind": 0.2566
     }
   },
   "PY": {
@@ -12865,14 +12865,14 @@
       "Wind": 0.1187
     },
     "2025": {
-      "Bioenergy": 0.0109,
-      "Coal": 0.1356,
-      "Gas": 0.1788,
-      "Hydro": 0.2326,
-      "Nuclear": 0.1974,
-      "Other Fossil": 0.0021,
-      "Other Renewables": 0.0007,
-      "Solar": 0.1289,
+      "Bioenergy": 0.0106,
+      "Coal": 0.133,
+      "Gas": 0.1799,
+      "Hydro": 0.2349,
+      "Nuclear": 0.1982,
+      "Other Fossil": 0.0018,
+      "Other Renewables": 0.0006,
+      "Solar": 0.1279,
       "Wind": 0.1132
     }
   },
@@ -12944,15 +12944,15 @@
       "Wind": 0.0372
     },
     "2025": {
-      "Bioenergy": 0.0094,
-      "Coal": 0.6334,
-      "Gas": 0.0549,
-      "Hydro": 0.2482,
+      "Bioenergy": 0.0095,
+      "Coal": 0.6275,
+      "Gas": 0.0552,
+      "Hydro": 0.2522,
       "Nuclear": 0.005,
       "Other Fossil": 0.0067,
       "Other Renewables": 0.0002,
       "Solar": 0.0033,
-      "Wind": 0.0389
+      "Wind": 0.0404
     }
   },
   "RU": {
@@ -13024,14 +13024,14 @@
     },
     "2025": {
       "Bioenergy": 0.0007,
-      "Coal": 0.177,
-      "Gas": 0.4422,
-      "Hydro": 0.1743,
-      "Nuclear": 0.1872,
+      "Coal": 0.1773,
+      "Gas": 0.4431,
+      "Hydro": 0.1716,
+      "Nuclear": 0.1888,
       "Other Fossil": 0.0127,
       "Other Renewables": 0,
-      "Solar": 0.0021,
-      "Wind": 0.0039
+      "Solar": 0.0022,
+      "Wind": 0.0037
     }
   },
   "RW": {
@@ -13500,12 +13500,12 @@
       "Bioenergy": 0.0353,
       "Coal": 0,
       "Gas": 0,
-      "Hydro": 0.4186,
-      "Nuclear": 0.2838,
+      "Hydro": 0.4123,
+      "Nuclear": 0.2798,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0352,
-      "Wind": 0.227
+      "Solar": 0.0355,
+      "Wind": 0.237
     }
   },
   "SG": {
@@ -13577,7 +13577,7 @@
     },
     "2025": {
       "Bioenergy": 0.0001,
-      "Coal": 0.0025,
+      "Coal": 0.0026,
       "Gas": 0.9391,
       "Hydro": 0.0006,
       "Nuclear": 0.0003,
@@ -13734,14 +13734,14 @@
       "Wind": 0.0022
     },
     "2025": {
-      "Bioenergy": 0.0085,
-      "Coal": 0.1139,
-      "Gas": 0.0561,
-      "Hydro": 0.2849,
-      "Nuclear": 0.4269,
+      "Bioenergy": 0.0086,
+      "Coal": 0.1136,
+      "Gas": 0.0564,
+      "Hydro": 0.2798,
+      "Nuclear": 0.4292,
       "Other Fossil": 0.0001,
       "Other Renewables": 0,
-      "Solar": 0.1092,
+      "Solar": 0.1119,
       "Wind": 0.0004
     }
   },
@@ -13813,12 +13813,12 @@
       "Wind": 0
     },
     "2025": {
-      "Bioenergy": 0.0336,
+      "Bioenergy": 0.0331,
       "Coal": 0.0017,
-      "Gas": 0.0943,
-      "Hydro": 0.1083,
-      "Nuclear": 0.6762,
-      "Other Fossil": 0.0436,
+      "Gas": 0.0922,
+      "Hydro": 0.1067,
+      "Nuclear": 0.6793,
+      "Other Fossil": 0.0447,
       "Other Renewables": 0.0176,
       "Solar": 0.0247,
       "Wind": 0
@@ -14368,13 +14368,13 @@
     "2025": {
       "Bioenergy": 0.1521,
       "Coal": 0.0024,
-      "Gas": 0.2266,
-      "Hydro": 0.1792,
-      "Nuclear": 0.0011,
-      "Other Fossil": 0.0336,
+      "Gas": 0.2268,
+      "Hydro": 0.1788,
+      "Nuclear": 0.0012,
+      "Other Fossil": 0.0335,
       "Other Renewables": 0.1973,
-      "Solar": 0.1563,
-      "Wind": 0.0515
+      "Solar": 0.1564,
+      "Wind": 0.0516
     }
   },
   "SY": {
@@ -14840,15 +14840,15 @@
       "Wind": 0.0268
     },
     "2025": {
-      "Bioenergy": 0.059,
-      "Coal": 0.1979,
-      "Gas": 0.6029,
-      "Hydro": 0.0506,
-      "Nuclear": 0.0065,
+      "Bioenergy": 0.054,
+      "Coal": 0.2233,
+      "Gas": 0.5793,
+      "Hydro": 0.0498,
+      "Nuclear": 0.0073,
       "Other Fossil": 0.0008,
       "Other Renewables": 0.0007,
-      "Solar": 0.0565,
-      "Wind": 0.0252
+      "Solar": 0.0588,
+      "Wind": 0.026
     }
   },
   "TJ": {
@@ -14922,7 +14922,7 @@
       "Bioenergy": 0.0003,
       "Coal": 0.1126,
       "Gas": 0.0244,
-      "Hydro": 0.8585,
+      "Hydro": 0.8584,
       "Nuclear": 0.0009,
       "Other Fossil": 0.0001,
       "Other Renewables": 0.0001,
@@ -15472,15 +15472,15 @@
       "Wind": 0.0368
     },
     "2025": {
-      "Bioenergy": 0.0009,
+      "Bioenergy": 0.0008,
       "Coal": 0.3686,
-      "Gas": 0.4732,
-      "Hydro": 0.0203,
-      "Nuclear": 0.0174,
-      "Other Fossil": 0.0293,
+      "Gas": 0.4736,
+      "Hydro": 0.0208,
+      "Nuclear": 0.0172,
+      "Other Fossil": 0.0281,
       "Other Renewables": 0,
-      "Solar": 0.0521,
-      "Wind": 0.0383
+      "Solar": 0.0505,
+      "Wind": 0.0405
     }
   },
   "TZ": {
@@ -15788,15 +15788,15 @@
       "Wind": 0.1035
     },
     "2025": {
-      "Bioenergy": 0.0098,
-      "Coal": 0.1677,
-      "Gas": 0.3957,
+      "Bioenergy": 0.01,
+      "Coal": 0.1649,
+      "Gas": 0.3973,
       "Hydro": 0.0546,
-      "Nuclear": 0.1696,
-      "Other Fossil": 0.0086,
+      "Nuclear": 0.1711,
+      "Other Fossil": 0.0075,
       "Other Renewables": 0.0038,
-      "Solar": 0.0894,
-      "Wind": 0.1008
+      "Solar": 0.0891,
+      "Wind": 0.1016
     }
   },
   "UY": {
@@ -15867,15 +15867,15 @@
       "Wind": 0.3322
     },
     "2025": {
-      "Bioenergy": 0.1385,
+      "Bioenergy": 0.1383,
       "Coal": 0.0016,
-      "Gas": 0.0296,
-      "Hydro": 0.4603,
+      "Gas": 0.0267,
+      "Hydro": 0.4557,
       "Nuclear": 0.001,
-      "Other Fossil": 0.0115,
+      "Other Fossil": 0.0106,
       "Other Renewables": 0.0003,
-      "Solar": 0.0366,
-      "Wind": 0.3206
+      "Solar": 0.0377,
+      "Wind": 0.3281
     }
   },
   "UZ": {
@@ -15947,7 +15947,7 @@
     },
     "2025": {
       "Bioenergy": 0.0004,
-      "Coal": 0.0693,
+      "Coal": 0.0694,
       "Gas": 0.8121,
       "Hydro": 0.1019,
       "Nuclear": 0.0011,
@@ -16578,15 +16578,15 @@
       "Wind": 0.0647
     },
     "2025": {
-      "Bioenergy": 0.0066,
-      "Coal": 0.7029,
-      "Gas": 0.057,
-      "Hydro": 0.0816,
-      "Nuclear": 0.0468,
-      "Other Fossil": 0.0053,
-      "Other Renewables": 0.0016,
-      "Solar": 0.0212,
-      "Wind": 0.077
+      "Bioenergy": 0.0067,
+      "Coal": 0.7027,
+      "Gas": 0.0571,
+      "Hydro": 0.0815,
+      "Nuclear": 0.047,
+      "Other Fossil": 0.0047,
+      "Other Renewables": 0.0017,
+      "Solar": 0.0213,
+      "Wind": 0.0773
     }
   },
   "YE": {