npm - @digital4better/data - Versions diffs - 1.2.24 → 1.2.26 - Mend

@digital4better/data 1.2.24 → 1.2.26

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 +66 -66
package/data/factor/continent-monthly-green.json +434 -434
package/data/factor/continent-monthly.csv +89 -89
package/data/factor/continent-monthly.json +475 -475
package/data/factor/continent-yearly-green.csv +15 -15
package/data/factor/continent-yearly-green.json +101 -101
package/data/factor/continent-yearly.csv +15 -15
package/data/factor/continent-yearly.json +87 -87
package/data/factor/country-monthly-green.csv +455 -455
package/data/factor/country-monthly-green.json +3707 -3707
package/data/factor/country-monthly.csv +827 -827
package/data/factor/country-monthly.json +5309 -5309
package/data/factor/country-yearly-green.csv +150 -150
package/data/factor/country-yearly-green.json +1126 -1126
package/data/factor/country-yearly.csv +184 -184
package/data/factor/country-yearly.json +1189 -1189
package/data/factor/subdivision-monthly-green.csv +39 -39
package/data/factor/subdivision-monthly-green.json +342 -342
package/data/factor/subdivision-monthly.csv +39 -39
package/data/factor/subdivision-monthly.json +351 -351
package/data/factor/subdivision-yearly-green.csv +56 -56
package/data/factor/subdivision-yearly-green.json +240 -240
package/data/factor/subdivision-yearly.csv +55 -55
package/data/factor/subdivision-yearly.json +217 -217
package/data/factor/world-monthly-green.csv +19 -19
package/data/factor/world-monthly-green.json +153 -153
package/data/factor/world-monthly.csv +23 -23
package/data/factor/world-monthly.json +144 -144
package/data/factor/world-yearly-green.csv +3 -3
package/data/factor/world-yearly-green.json +23 -23
package/data/factor/world-yearly.csv +3 -3
package/data/factor/world-yearly.json +19 -19
package/data/mix/continent-monthly-green.csv +32 -32
package/data/mix/continent-monthly-green.json +108 -108
package/data/mix/continent-monthly.csv +32 -32
package/data/mix/continent-monthly.json +146 -146
package/data/mix/continent-yearly-green.csv +7 -7
package/data/mix/continent-yearly-green.json +25 -25
package/data/mix/continent-yearly.csv +7 -7
package/data/mix/continent-yearly.json +43 -43
package/data/mix/country-monthly-green.csv +388 -388
package/data/mix/country-monthly-green.json +932 -932
package/data/mix/country-monthly.csv +388 -388
package/data/mix/country-monthly.json +1453 -1453
package/data/mix/country-yearly-green.csv +80 -80
package/data/mix/country-yearly-green.json +280 -280
package/data/mix/country-yearly.csv +80 -80
package/data/mix/country-yearly.json +528 -528
package/data/mix/subdivision-monthly-green.csv +33 -33
package/data/mix/subdivision-monthly-green.json +57 -57
package/data/mix/subdivision-monthly.csv +33 -33
package/data/mix/subdivision-monthly.json +129 -129
package/data/mix/subdivision-yearly-green.csv +12 -12
package/data/mix/subdivision-yearly-green.json +25 -25
package/data/mix/subdivision-yearly.csv +12 -12
package/data/mix/subdivision-yearly.json +54 -54
package/data/mix/world-monthly-green.csv +10 -10
package/data/mix/world-monthly-green.json +32 -32
package/data/mix/world-monthly.csv +10 -10
package/data/mix/world-monthly.json +35 -35
package/data/mix/world-yearly-green.csv +2 -2
package/data/mix/world-yearly-green.json +5 -5
package/data/mix/world-yearly.csv +2 -2
package/data/mix/world-yearly.json +8 -8
package/package.json +2 -2

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

@@ -146,15 +146,15 @@
       "Wind": 0.0566
     },
     "2025": {
-      "Bioenergy": 0.0166,
-      "Coal": 0.4366,
-      "Gas": 0.0767,
-      "Hydro": 0.2581,
-      "Nuclear": 0.0424,
-      "Other Fossil": 0.0212,
+      "Bioenergy": 0.0163,
+      "Coal": 0.4288,
+      "Gas": 0.0757,
+      "Hydro": 0.2591,
+      "Nuclear": 0.0437,
+      "Other Fossil": 0.021,
       "Other Renewables": 0.0042,
-      "Solar": 0.0777,
-      "Wind": 0.0665
+      "Solar": 0.0815,
+      "Wind": 0.0698
     }
   },
   "AG": {
@@ -304,15 +304,15 @@
       "Wind": 0.0404
     },
     "2025": {
-      "Bioenergy": 0.0089,
-      "Coal": 0.0458,
-      "Gas": 0.0797,
-      "Hydro": 0.7305,
-      "Nuclear": 0.0639,
-      "Other Fossil": 0.0077,
-      "Other Renewables": 0.002,
-      "Solar": 0.0217,
-      "Wind": 0.0398
+      "Bioenergy": 0.0091,
+      "Coal": 0.0447,
+      "Gas": 0.0785,
+      "Hydro": 0.7321,
+      "Nuclear": 0.063,
+      "Other Fossil": 0.0074,
+      "Other Renewables": 0.0021,
+      "Solar": 0.0245,
+      "Wind": 0.0386
     }
   },
   "AM": {
@@ -541,15 +541,15 @@
       "Wind": 0.1136
     },
     "2025": {
-      "Bioenergy": 0.0078,
-      "Coal": 0.0039,
-      "Gas": 0.5899,
-      "Hydro": 0.1878,
-      "Nuclear": 0.0607,
-      "Other Fossil": 0.0115,
-      "Other Renewables": 0.0002,
-      "Solar": 0.033,
-      "Wind": 0.1053
+      "Bioenergy": 0.0084,
+      "Coal": 0.0031,
+      "Gas": 0.5806,
+      "Hydro": 0.1853,
+      "Nuclear": 0.0681,
+      "Other Fossil": 0.0103,
+      "Other Renewables": 0.0001,
+      "Solar": 0.0324,
+      "Wind": 0.1118
     }
   },
   "AS": {
@@ -699,15 +699,15 @@
       "Wind": 0.1338
     },
     "2025": {
-      "Bioenergy": 0.0343,
-      "Coal": 0.0205,
-      "Gas": 0.2316,
-      "Hydro": 0.4362,
-      "Nuclear": 0.0287,
-      "Other Fossil": 0.0177,
-      "Other Renewables": 0.0009,
-      "Solar": 0.0887,
-      "Wind": 0.1414
+      "Bioenergy": 0.033,
+      "Coal": 0.0159,
+      "Gas": 0.2105,
+      "Hydro": 0.4663,
+      "Nuclear": 0.0217,
+      "Other Fossil": 0.0169,
+      "Other Renewables": 0.0007,
+      "Solar": 0.0937,
+      "Wind": 0.1412
     }
   },
   "AU": {
@@ -778,15 +778,15 @@
       "Wind": 0.1343
     },
     "2025": {
-      "Bioenergy": 0.0011,
-      "Coal": 0.5175,
-      "Gas": 0.0607,
-      "Hydro": 0.0447,
+      "Bioenergy": 0.001,
+      "Coal": 0.5178,
+      "Gas": 0.062,
+      "Hydro": 0.0469,
       "Nuclear": 0,
       "Other Fossil": 0.0001,
       "Other Renewables": 0,
-      "Solar": 0.2338,
-      "Wind": 0.142
+      "Solar": 0.234,
+      "Wind": 0.1382
     }
   },
   "AW": {
@@ -1016,14 +1016,14 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Coal": 0.6045,
+      "Coal": 0.6022,
       "Gas": 0,
-      "Hydro": 0.3714,
+      "Hydro": 0.3659,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0089,
-      "Wind": 0.0152
+      "Solar": 0.0159,
+      "Wind": 0.016
     }
   },
   "BB": {
@@ -1173,15 +1173,15 @@
       "Wind": 0.0115
     },
     "2025": {
-      "Bioenergy": 0.0038,
-      "Coal": 0.3871,
-      "Gas": 0.3981,
-      "Hydro": 0.0151,
-      "Nuclear": 0.0096,
-      "Other Fossil": 0.1405,
+      "Bioenergy": 0.0034,
+      "Coal": 0.359,
+      "Gas": 0.4407,
+      "Hydro": 0.0144,
+      "Nuclear": 0.0093,
+      "Other Fossil": 0.1278,
       "Other Renewables": 0.0009,
-      "Solar": 0.0299,
-      "Wind": 0.0151
+      "Solar": 0.0297,
+      "Wind": 0.0148
     }
   },
   "BE": {
@@ -1243,7 +1243,7 @@
     "2024": {
       "Bioenergy": 0.0119,
       "Coal": 0.018,
-      "Gas": 0.1661,
+      "Gas": 0.166,
       "Hydro": 0.026,
       "Nuclear": 0.3957,
       "Other Fossil": 0.0919,
@@ -1252,15 +1252,15 @@
       "Wind": 0.1779
     },
     "2025": {
-      "Bioenergy": 0.0119,
-      "Coal": 0.0202,
-      "Gas": 0.2316,
-      "Hydro": 0.023,
-      "Nuclear": 0.3781,
-      "Other Fossil": 0.1015,
-      "Other Renewables": 0.0009,
-      "Solar": 0.1009,
-      "Wind": 0.132
+      "Bioenergy": 0.0124,
+      "Coal": 0.021,
+      "Gas": 0.2309,
+      "Hydro": 0.0252,
+      "Nuclear": 0.3576,
+      "Other Fossil": 0.0997,
+      "Other Renewables": 0.001,
+      "Solar": 0.1136,
+      "Wind": 0.1387
     }
   },
   "BF": {
@@ -1410,15 +1410,15 @@
       "Wind": 0.0411
     },
     "2025": {
-      "Bioenergy": 0.0028,
-      "Coal": 0.3271,
-      "Gas": 0.0594,
-      "Hydro": 0.0508,
-      "Nuclear": 0.4107,
+      "Bioenergy": 0.0029,
+      "Coal": 0.3202,
+      "Gas": 0.0579,
+      "Hydro": 0.0568,
+      "Nuclear": 0.4103,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.1127,
-      "Wind": 0.0365
+      "Solar": 0.117,
+      "Wind": 0.0348
     }
   },
   "BH": {
@@ -2348,25 +2348,25 @@
     },
     "2024": {
       "Bioenergy": 0.171,
-      "Coal": 0.0157,
+      "Coal": 0.0156,
       "Gas": 0.1043,
       "Hydro": 0.5107,
       "Nuclear": 0.0092,
       "Other Fossil": 0.1039,
       "Other Renewables": 0.0024,
-      "Solar": 0.042,
-      "Wind": 0.041
+      "Solar": 0.0419,
+      "Wind": 0.0409
     },
     "2025": {
-      "Bioenergy": 0.1693,
-      "Coal": 0.0136,
-      "Gas": 0.0937,
-      "Hydro": 0.5282,
-      "Nuclear": 0.0092,
-      "Other Fossil": 0.1014,
-      "Other Renewables": 0.0023,
-      "Solar": 0.0465,
-      "Wind": 0.0356
+      "Bioenergy": 0.1694,
+      "Coal": 0.0124,
+      "Gas": 0.093,
+      "Hydro": 0.5271,
+      "Nuclear": 0.0095,
+      "Other Fossil": 0.1019,
+      "Other Renewables": 0.0024,
+      "Solar": 0.0476,
+      "Wind": 0.0367
     }
   },
   "CA": {
@@ -2437,15 +2437,15 @@
       "Wind": 0.0757
     },
     "2025": {
-      "Bioenergy": 0.0151,
-      "Coal": 0.0439,
-      "Gas": 0.1378,
+      "Bioenergy": 0.0163,
+      "Coal": 0.0471,
+      "Gas": 0.1482,
       "Hydro": 0.5896,
-      "Nuclear": 0.1167,
-      "Other Fossil": 0.0097,
-      "Other Renewables": 0.0006,
-      "Solar": 0.0033,
-      "Wind": 0.0833
+      "Nuclear": 0.1073,
+      "Other Fossil": 0.0105,
+      "Other Renewables": 0.0005,
+      "Solar": 0.0041,
+      "Wind": 0.0764
     }
   },
   "CD": {
@@ -2744,7 +2744,7 @@
     "2024": {
       "Bioenergy": 0.0004,
       "Coal": 0.002,
-      "Gas": 0.0036,
+      "Gas": 0.0035,
       "Hydro": 0.5894,
       "Nuclear": 0.292,
       "Other Fossil": 0.0396,
@@ -2753,15 +2753,15 @@
       "Wind": 0.0046
     },
     "2025": {
-      "Bioenergy": 0.0041,
-      "Coal": 0.0207,
-      "Gas": 0.0359,
-      "Hydro": 0.3987,
-      "Nuclear": 0.3817,
-      "Other Fossil": 0.0511,
-      "Other Renewables": 0.0009,
-      "Solar": 0.0863,
-      "Wind": 0.0206
+      "Bioenergy": 0.0029,
+      "Coal": 0.0149,
+      "Gas": 0.026,
+      "Hydro": 0.4284,
+      "Nuclear": 0.3678,
+      "Other Fossil": 0.0497,
+      "Other Renewables": 0.0007,
+      "Solar": 0.0942,
+      "Wind": 0.0154
     }
   },
   "CI": {
@@ -2990,15 +2990,15 @@
       "Wind": 0.1296
     },
     "2025": {
-      "Bioenergy": 0.023,
-      "Coal": 0.1582,
-      "Gas": 0.1714,
-      "Hydro": 0.2405,
+      "Bioenergy": 0.0245,
+      "Coal": 0.1537,
+      "Gas": 0.1774,
+      "Hydro": 0.2422,
       "Nuclear": 0,
-      "Other Fossil": 0.0121,
+      "Other Fossil": 0.0148,
       "Other Renewables": 0.0014,
-      "Solar": 0.2575,
-      "Wind": 0.1358
+      "Solar": 0.2512,
+      "Wind": 0.1349
     }
   },
   "CM": {
@@ -3228,14 +3228,14 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Coal": 0.1037,
-      "Gas": 0.0534,
-      "Hydro": 0.7826,
+      "Coal": 0.0671,
+      "Gas": 0.0678,
+      "Hydro": 0.8041,
       "Nuclear": 0,
-      "Other Fossil": 0.0056,
+      "Other Fossil": 0.0068,
       "Other Renewables": 0,
-      "Solar": 0.0531,
-      "Wind": 0.0016
+      "Solar": 0.0527,
+      "Wind": 0.0015
     }
   },
   "CR": {
@@ -3307,14 +3307,14 @@
     },
     "2025": {
       "Bioenergy": 0.0092,
-      "Coal": 0.0012,
-      "Gas": 0.0083,
-      "Hydro": 0.6576,
-      "Nuclear": 0.0008,
-      "Other Fossil": 0.0443,
-      "Other Renewables": 0.1129,
-      "Solar": 0.0032,
-      "Wind": 0.1625
+      "Coal": 0.0006,
+      "Gas": 0.0046,
+      "Hydro": 0.673,
+      "Nuclear": 0.0005,
+      "Other Fossil": 0.0319,
+      "Other Renewables": 0.1136,
+      "Solar": 0.0019,
+      "Wind": 0.1646
     }
   },
   "CU": {
@@ -3622,15 +3622,15 @@
       "Wind": 0.0103
     },
     "2025": {
-      "Bioenergy": 0.0346,
-      "Coal": 0.4131,
-      "Gas": 0.0627,
-      "Hydro": 0.0251,
-      "Nuclear": 0.3731,
-      "Other Fossil": 0.01,
-      "Other Renewables": 0.0288,
-      "Solar": 0.0457,
-      "Wind": 0.007
+      "Bioenergy": 0.036,
+      "Coal": 0.3987,
+      "Gas": 0.0635,
+      "Hydro": 0.0257,
+      "Nuclear": 0.3787,
+      "Other Fossil": 0.0096,
+      "Other Renewables": 0.0295,
+      "Solar": 0.0511,
+      "Wind": 0.0073
     }
   },
   "DE": {
@@ -3701,15 +3701,15 @@
       "Wind": 0.2727
     },
     "2025": {
-      "Bioenergy": 0.0784,
-      "Coal": 0.2585,
-      "Gas": 0.178,
-      "Hydro": 0.0333,
-      "Nuclear": 0.0055,
-      "Other Fossil": 0.0826,
+      "Bioenergy": 0.0817,
+      "Coal": 0.2506,
+      "Gas": 0.1717,
+      "Hydro": 0.0358,
+      "Nuclear": 0.0064,
+      "Other Fossil": 0.0719,
       "Other Renewables": 0.0002,
-      "Solar": 0.1222,
-      "Wind": 0.2413
+      "Solar": 0.141,
+      "Wind": 0.2407
     }
   },
   "DJ": {
@@ -3859,15 +3859,15 @@
       "Wind": 0.5431
     },
     "2025": {
-      "Bioenergy": 0.1371,
-      "Coal": 0.1065,
-      "Gas": 0.0873,
-      "Hydro": 0.0199,
-      "Nuclear": 0.0254,
-      "Other Fossil": 0.0366,
-      "Other Renewables": 0.0008,
-      "Solar": 0.0794,
-      "Wind": 0.507
+      "Bioenergy": 0.1312,
+      "Coal": 0.1093,
+      "Gas": 0.0961,
+      "Hydro": 0.0281,
+      "Nuclear": 0.0335,
+      "Other Fossil": 0.0393,
+      "Other Renewables": 0.0011,
+      "Solar": 0.0941,
+      "Wind": 0.4674
     }
   },
   "DM": {
@@ -4254,15 +4254,15 @@
       "Wind": 0.2017
     },
     "2025": {
-      "Bioenergy": 0.0808,
-      "Coal": 0.0484,
-      "Gas": 0.0844,
-      "Hydro": 0.0522,
-      "Nuclear": 0.067,
-      "Other Fossil": 0.3544,
-      "Other Renewables": 0.0021,
-      "Solar": 0.0756,
-      "Wind": 0.2351
+      "Bioenergy": 0.0784,
+      "Coal": 0.0458,
+      "Gas": 0.0805,
+      "Hydro": 0.0508,
+      "Nuclear": 0.0635,
+      "Other Fossil": 0.3614,
+      "Other Renewables": 0.002,
+      "Solar": 0.0954,
+      "Wind": 0.2222
     }
   },
   "EG": {
@@ -4491,15 +4491,15 @@
       "Wind": 0.2368
     },
     "2025": {
-      "Bioenergy": 0.0132,
-      "Coal": 0.0109,
-      "Gas": 0.1565,
-      "Hydro": 0.1625,
-      "Nuclear": 0.224,
-      "Other Fossil": 0.0066,
-      "Other Renewables": 0.0023,
-      "Solar": 0.1495,
-      "Wind": 0.2745
+      "Bioenergy": 0.0138,
+      "Coal": 0.0111,
+      "Gas": 0.1617,
+      "Hydro": 0.1672,
+      "Nuclear": 0.2096,
+      "Other Fossil": 0.0067,
+      "Other Renewables": 0.0024,
+      "Solar": 0.1707,
+      "Wind": 0.2569
     }
   },
   "ET": {
@@ -4649,15 +4649,15 @@
       "Wind": 0.2352
     },
     "2025": {
-      "Bioenergy": 0.1297,
-      "Coal": 0.025,
-      "Gas": 0.03,
-      "Hydro": 0.154,
-      "Nuclear": 0.3139,
-      "Other Fossil": 0.0535,
-      "Other Renewables": 0.0039,
-      "Solar": 0.0106,
-      "Wind": 0.2794
+      "Bioenergy": 0.1292,
+      "Coal": 0.0238,
+      "Gas": 0.033,
+      "Hydro": 0.1561,
+      "Nuclear": 0.316,
+      "Other Fossil": 0.052,
+      "Other Renewables": 0.0038,
+      "Solar": 0.0156,
+      "Wind": 0.2704
     }
   },
   "FJ": {
@@ -4965,15 +4965,15 @@
       "Wind": 0.0899
     },
     "2025": {
-      "Bioenergy": 0.0053,
-      "Coal": 0.0034,
-      "Gas": 0.0503,
-      "Hydro": 0.107,
-      "Nuclear": 0.6963,
-      "Other Fossil": 0.007,
+      "Bioenergy": 0.0054,
+      "Coal": 0.0036,
+      "Gas": 0.0445,
+      "Hydro": 0.1089,
+      "Nuclear": 0.6962,
+      "Other Fossil": 0.0071,
       "Other Renewables": 0,
-      "Solar": 0.0401,
-      "Wind": 0.0907
+      "Solar": 0.043,
+      "Wind": 0.0914
     }
   },
   "GA": {
@@ -5103,7 +5103,7 @@
     "2023": {
       "Bioenergy": 0.0536,
       "Coal": 0.0236,
-      "Gas": 0.3518,
+      "Gas": 0.3517,
       "Hydro": 0.0279,
       "Nuclear": 0.164,
       "Other Fossil": 0.0116,
@@ -5123,15 +5123,15 @@
       "Wind": 0.3204
     },
     "2025": {
-      "Bioenergy": 0.0658,
-      "Coal": 0.0166,
-      "Gas": 0.3883,
-      "Hydro": 0.0319,
-      "Nuclear": 0.1462,
-      "Other Fossil": 0.0183,
+      "Bioenergy": 0.0721,
+      "Coal": 0.0162,
+      "Gas": 0.3778,
+      "Hydro": 0.0315,
+      "Nuclear": 0.1507,
+      "Other Fossil": 0.0182,
       "Other Renewables": 0.0008,
-      "Solar": 0.0528,
-      "Wind": 0.2794
+      "Solar": 0.0618,
+      "Wind": 0.2709
     }
   },
   "GD": {
@@ -5277,19 +5277,19 @@
       "Nuclear": 0.0038,
       "Other Fossil": 0.0004,
       "Other Renewables": 0.0004,
-      "Solar": 0.0052,
+      "Solar": 0.0053,
       "Wind": 0.0136
     },
     "2025": {
-      "Bioenergy": 0.0065,
-      "Coal": 0.165,
-      "Gas": 0.3478,
-      "Hydro": 0.3999,
-      "Nuclear": 0.0165,
-      "Other Fossil": 0.0021,
-      "Other Renewables": 0.0016,
-      "Solar": 0.0266,
-      "Wind": 0.0339
+      "Bioenergy": 0.0051,
+      "Coal": 0.129,
+      "Gas": 0.2516,
+      "Hydro": 0.5466,
+      "Nuclear": 0.0134,
+      "Other Fossil": 0.0016,
+      "Other Renewables": 0.0013,
+      "Solar": 0.022,
+      "Wind": 0.0293
     }
   },
   "GF": {
@@ -5992,15 +5992,15 @@
       "Wind": 0.2196
     },
     "2025": {
-      "Bioenergy": 0.0004,
-      "Coal": 0.0785,
-      "Gas": 0.4455,
-      "Hydro": 0.0387,
-      "Nuclear": 0.0028,
-      "Other Fossil": 0.0004,
-      "Other Renewables": 0.0001,
-      "Solar": 0.2104,
-      "Wind": 0.2233
+      "Bioenergy": 0.001,
+      "Coal": 0.0802,
+      "Gas": 0.4365,
+      "Hydro": 0.0434,
+      "Nuclear": 0.0067,
+      "Other Fossil": 0.0008,
+      "Other Renewables": 0.0002,
+      "Solar": 0.223,
+      "Wind": 0.2081
     }
   },
   "GT": {
@@ -6387,15 +6387,15 @@
       "Wind": 0.0184
     },
     "2025": {
-      "Bioenergy": 0.0083,
-      "Coal": 0.5651,
-      "Gas": 0.3401,
-      "Hydro": 0.0217,
-      "Nuclear": 0.0138,
-      "Other Fossil": 0.0055,
+      "Bioenergy": 0.0081,
+      "Coal": 0.5625,
+      "Gas": 0.3397,
+      "Hydro": 0.022,
+      "Nuclear": 0.0142,
+      "Other Fossil": 0.0054,
       "Other Renewables": 0.0014,
-      "Solar": 0.0226,
-      "Wind": 0.0217
+      "Solar": 0.0238,
+      "Wind": 0.0227
     }
   },
   "HN": {
@@ -6467,14 +6467,14 @@
     },
     "2025": {
       "Bioenergy": 0.1282,
-      "Coal": 0.0051,
-      "Gas": 0.0049,
+      "Coal": 0.005,
+      "Gas": 0.0048,
       "Hydro": 0.2238,
       "Nuclear": 0.0005,
       "Other Fossil": 0.4372,
       "Other Renewables": 0.0264,
-      "Solar": 0.1,
-      "Wind": 0.0737
+      "Solar": 0.1001,
+      "Wind": 0.0738
     }
   },
   "HR": {
@@ -6545,15 +6545,15 @@
       "Wind": 0.1734
     },
     "2025": {
-      "Bioenergy": 0.0377,
-      "Coal": 0.0305,
-      "Gas": 0.2217,
-      "Hydro": 0.3663,
-      "Nuclear": 0.0416,
-      "Other Fossil": 0.0112,
-      "Other Renewables": 0.0141,
-      "Solar": 0.0587,
-      "Wind": 0.2183
+      "Bioenergy": 0.0386,
+      "Coal": 0.0314,
+      "Gas": 0.225,
+      "Hydro": 0.3586,
+      "Nuclear": 0.0432,
+      "Other Fossil": 0.0114,
+      "Other Renewables": 0.0144,
+      "Solar": 0.0617,
+      "Wind": 0.2158
     }
   },
   "HT": {
@@ -6703,15 +6703,15 @@
       "Wind": 0.0448
     },
     "2025": {
-      "Bioenergy": 0.0413,
-      "Coal": 0.0752,
-      "Gas": 0.2534,
-      "Hydro": 0.0455,
+      "Bioenergy": 0.0399,
+      "Coal": 0.0691,
+      "Gas": 0.2314,
+      "Hydro": 0.041,
       "Nuclear": 0.3714,
-      "Other Fossil": 0.0186,
-      "Other Renewables": 0.0041,
-      "Solar": 0.1442,
-      "Wind": 0.0463
+      "Other Fossil": 0.0176,
+      "Other Renewables": 0.0039,
+      "Solar": 0.1841,
+      "Wind": 0.0417
     }
   },
   "ID": {
@@ -6783,7 +6783,7 @@
     },
     "2025": {
       "Bioenergy": 0.0411,
-      "Coal": 0.5904,
+      "Coal": 0.5903,
       "Gas": 0.2103,
       "Hydro": 0.0717,
       "Nuclear": 0.0003,
@@ -6861,15 +6861,15 @@
       "Wind": 0.3483
     },
     "2025": {
-      "Bioenergy": 0.0069,
-      "Coal": 0.0351,
-      "Gas": 0.4026,
-      "Hydro": 0.0492,
-      "Nuclear": 0.0271,
-      "Other Fossil": 0.0345,
+      "Bioenergy": 0.0068,
+      "Coal": 0.0486,
+      "Gas": 0.4614,
+      "Hydro": 0.0485,
+      "Nuclear": 0.027,
+      "Other Fossil": 0.0474,
       "Other Renewables": 0.0009,
-      "Solar": 0.0143,
-      "Wind": 0.4294
+      "Solar": 0.0182,
+      "Wind": 0.341
     }
   },
   "IL": {
@@ -7019,15 +7019,15 @@
       "Wind": 0.0452
     },
     "2025": {
-      "Bioenergy": 0.0141,
-      "Coal": 0.7661,
-      "Gas": 0.0113,
-      "Hydro": 0.0534,
-      "Nuclear": 0.0301,
-      "Other Fossil": 0.0002,
-      "Other Renewables": 0.0016,
-      "Solar": 0.0891,
-      "Wind": 0.0339
+      "Bioenergy": 0.0114,
+      "Coal": 0.755,
+      "Gas": 0.011,
+      "Hydro": 0.0582,
+      "Nuclear": 0.032,
+      "Other Fossil": 0.0014,
+      "Other Renewables": 0.0015,
+      "Solar": 0.0959,
+      "Wind": 0.0334
     }
   },
   "IQ": {
@@ -7335,15 +7335,15 @@
       "Wind": 0.0964
     },
     "2025": {
-      "Bioenergy": 0.0544,
-      "Coal": 0.04,
-      "Gas": 0.5022,
-      "Hydro": 0.1124,
-      "Nuclear": 0.0354,
-      "Other Fossil": 0.0303,
+      "Bioenergy": 0.0545,
+      "Coal": 0.0394,
+      "Gas": 0.5016,
+      "Hydro": 0.1133,
+      "Nuclear": 0.0349,
+      "Other Fossil": 0.0301,
       "Other Renewables": 0.019,
-      "Solar": 0.078,
-      "Wind": 0.1284
+      "Solar": 0.0795,
+      "Wind": 0.1277
     }
   },
   "JM": {
@@ -7640,26 +7640,26 @@
       "Wind": 0.1517
     },
     "2024": {
-      "Bioenergy": 0.0111,
+      "Bioenergy": 0.0196,
       "Coal": 0.0318,
       "Gas": 0.0436,
-      "Hydro": 0.2751,
+      "Hydro": 0.2749,
       "Nuclear": 0.0016,
-      "Other Fossil": 0.0751,
-      "Other Renewables": 0.3962,
+      "Other Fossil": 0.0672,
+      "Other Renewables": 0.3959,
       "Solar": 0.0341,
-      "Wind": 0.1314
+      "Wind": 0.1313
     },
     "2025": {
-      "Bioenergy": 0.017,
-      "Coal": 0.0349,
-      "Gas": 0.0478,
-      "Hydro": 0.2502,
-      "Nuclear": 0.0017,
-      "Other Fossil": 0.0817,
-      "Other Renewables": 0.3974,
-      "Solar": 0.0345,
-      "Wind": 0.1348
+      "Bioenergy": 0.0264,
+      "Coal": 0.0327,
+      "Gas": 0.0448,
+      "Hydro": 0.2345,
+      "Nuclear": 0.0016,
+      "Other Fossil": 0.085,
+      "Other Renewables": 0.3781,
+      "Solar": 0.0361,
+      "Wind": 0.1607
     }
   },
   "KG": {
@@ -7731,14 +7731,14 @@
     },
     "2025": {
       "Bioenergy": 0.0016,
-      "Coal": 0.0996,
-      "Gas": 0.0158,
-      "Hydro": 0.8398,
-      "Nuclear": 0.0041,
+      "Coal": 0.0989,
+      "Gas": 0.0157,
+      "Hydro": 0.8399,
+      "Nuclear": 0.0043,
       "Other Fossil": 0.0255,
       "Other Renewables": 0.0004,
-      "Solar": 0.0066,
-      "Wind": 0.0065
+      "Solar": 0.007,
+      "Wind": 0.0068
     }
   },
   "KH": {
@@ -7809,15 +7809,15 @@
       "Wind": 0.0186
     },
     "2025": {
-      "Bioenergy": 0.0138,
-      "Coal": 0.4639,
-      "Gas": 0.0252,
-      "Hydro": 0.3722,
-      "Nuclear": 0.0139,
-      "Other Fossil": 0.0555,
+      "Bioenergy": 0.0136,
+      "Coal": 0.4613,
+      "Gas": 0.0248,
+      "Hydro": 0.3726,
+      "Nuclear": 0.0144,
+      "Other Fossil": 0.0554,
       "Other Renewables": 0.0014,
-      "Solar": 0.0323,
-      "Wind": 0.0218
+      "Solar": 0.0336,
+      "Wind": 0.0229
     }
   },
   "KI": {
@@ -8977,7 +8977,7 @@
       "Gas": 0.195,
       "Hydro": 0.135,
       "Nuclear": 0.1202,
-      "Other Fossil": 0.0574,
+      "Other Fossil": 0.0575,
       "Other Renewables": 0.0039,
       "Solar": 0.0892,
       "Wind": 0.2716
@@ -8994,15 +8994,15 @@
       "Wind": 0.3148
     },
     "2025": {
-      "Bioenergy": 0.0246,
-      "Coal": 0.046,
-      "Gas": 0.2468,
-      "Hydro": 0.074,
-      "Nuclear": 0.063,
-      "Other Fossil": 0.1088,
-      "Other Renewables": 0.002,
-      "Solar": 0.0802,
-      "Wind": 0.3547
+      "Bioenergy": 0.0219,
+      "Coal": 0.0414,
+      "Gas": 0.2496,
+      "Hydro": 0.0675,
+      "Nuclear": 0.056,
+      "Other Fossil": 0.109,
+      "Other Renewables": 0.0018,
+      "Solar": 0.1031,
+      "Wind": 0.3497
     }
   },
   "LU": {
@@ -9056,7 +9056,7 @@
       "Gas": 0.1981,
       "Hydro": 0.1443,
       "Nuclear": 0.1506,
-      "Other Fossil": 0.0366,
+      "Other Fossil": 0.0367,
       "Other Renewables": 0.0049,
       "Solar": 0.0992,
       "Wind": 0.2004
@@ -9073,15 +9073,15 @@
       "Wind": 0.1858
     },
     "2025": {
-      "Bioenergy": 0.0779,
-      "Coal": 0.1069,
-      "Gas": 0.209,
-      "Hydro": 0.1387,
-      "Nuclear": 0.1486,
+      "Bioenergy": 0.074,
+      "Coal": 0.1048,
+      "Gas": 0.2076,
+      "Hydro": 0.1362,
+      "Nuclear": 0.1465,
       "Other Fossil": 0.0407,
-      "Other Renewables": 0.0047,
-      "Solar": 0.1005,
-      "Wind": 0.1729
+      "Other Renewables": 0.0048,
+      "Solar": 0.1127,
+      "Wind": 0.1727
     }
   },
   "LV": {
@@ -9145,22 +9145,22 @@
       "Coal": 0.0391,
       "Gas": 0.2659,
       "Hydro": 0.4251,
-      "Nuclear": 0.0587,
+      "Nuclear": 0.0588,
       "Other Fossil": 0.0103,
       "Other Renewables": 0.0019,
       "Solar": 0.0774,
       "Wind": 0.0675
     },
     "2025": {
-      "Bioenergy": 0.0481,
-      "Coal": 0.0091,
-      "Gas": 0.3727,
-      "Hydro": 0.4466,
-      "Nuclear": 0.0131,
-      "Other Fossil": 0.0178,
-      "Other Renewables": 0.0004,
-      "Solar": 0.0519,
-      "Wind": 0.0401
+      "Bioenergy": 0.0544,
+      "Coal": 0.013,
+      "Gas": 0.3459,
+      "Hydro": 0.4416,
+      "Nuclear": 0.0196,
+      "Other Fossil": 0.0189,
+      "Other Renewables": 0.0007,
+      "Solar": 0.0619,
+      "Wind": 0.0442
     }
   },
   "LY": {
@@ -9390,14 +9390,14 @@
     },
     "2025": {
       "Bioenergy": 0.0006,
-      "Coal": 0.003,
+      "Coal": 0.0029,
       "Gas": 0.9219,
-      "Hydro": 0.045,
-      "Nuclear": 0.0042,
+      "Hydro": 0.0451,
+      "Nuclear": 0.0041,
       "Other Fossil": 0.0005,
       "Other Renewables": 0.0001,
-      "Solar": 0.0221,
-      "Wind": 0.0026
+      "Solar": 0.0223,
+      "Wind": 0.0025
     }
   },
   "ME": {
@@ -9468,15 +9468,15 @@
       "Wind": 0.0916
     },
     "2025": {
-      "Bioenergy": 0.0034,
-      "Coal": 0.3758,
-      "Gas": 0.0308,
-      "Hydro": 0.4515,
-      "Nuclear": 0.0245,
-      "Other Fossil": 0.0029,
-      "Other Renewables": 0.0008,
-      "Solar": 0.0071,
-      "Wind": 0.1032
+      "Bioenergy": 0.0084,
+      "Coal": 0.3054,
+      "Gas": 0.0654,
+      "Hydro": 0.4176,
+      "Nuclear": 0.0553,
+      "Other Fossil": 0.0064,
+      "Other Renewables": 0.0019,
+      "Solar": 0.0268,
+      "Wind": 0.1128
     }
   },
   "MG": {
@@ -9626,15 +9626,15 @@
       "Wind": 0.0428
     },
     "2025": {
-      "Bioenergy": 0.0193,
-      "Coal": 0.3158,
-      "Gas": 0.2763,
-      "Hydro": 0.2273,
-      "Nuclear": 0.0556,
-      "Other Fossil": 0.0067,
+      "Bioenergy": 0.0195,
+      "Coal": 0.3149,
+      "Gas": 0.2753,
+      "Hydro": 0.2287,
+      "Nuclear": 0.0549,
+      "Other Fossil": 0.0064,
       "Other Renewables": 0.0018,
-      "Solar": 0.0396,
-      "Wind": 0.0577
+      "Solar": 0.042,
+      "Wind": 0.0566
     }
   },
   "ML": {
@@ -9934,7 +9934,7 @@
       "Bioenergy": 0.0554,
       "Coal": 0.4676,
       "Gas": 0.1613,
-      "Hydro": 0.1032,
+      "Hydro": 0.1033,
       "Nuclear": 0.0448,
       "Other Fossil": 0.0342,
       "Other Renewables": 0.0045,
@@ -9942,15 +9942,15 @@
       "Wind": 0.0629
     },
     "2025": {
-      "Bioenergy": 0.0563,
-      "Coal": 0.4707,
-      "Gas": 0.1625,
-      "Hydro": 0.0739,
-      "Nuclear": 0.0471,
-      "Other Fossil": 0.0353,
+      "Bioenergy": 0.0559,
+      "Coal": 0.462,
+      "Gas": 0.1613,
+      "Hydro": 0.075,
+      "Nuclear": 0.0486,
+      "Other Fossil": 0.0351,
       "Other Renewables": 0.0046,
-      "Solar": 0.0757,
-      "Wind": 0.0738
+      "Solar": 0.08,
+      "Wind": 0.0775
     }
   },
   "MQ": {
@@ -10258,15 +10258,15 @@
       "Wind": 0.0282
     },
     "2025": {
-      "Bioenergy": 0.0064,
-      "Coal": 0.0332,
-      "Gas": 0.7296,
-      "Hydro": 0.036,
-      "Nuclear": 0.0462,
-      "Other Fossil": 0.0132,
+      "Bioenergy": 0.0066,
+      "Coal": 0.0325,
+      "Gas": 0.7288,
+      "Hydro": 0.0371,
+      "Nuclear": 0.0457,
+      "Other Fossil": 0.013,
       "Other Renewables": 0.0015,
-      "Solar": 0.105,
-      "Wind": 0.0291
+      "Solar": 0.1068,
+      "Wind": 0.0282
     }
   },
   "MU": {
@@ -10575,14 +10575,14 @@
     },
     "2025": {
       "Bioenergy": 0.0004,
-      "Coal": 0.0563,
-      "Gas": 0.6021,
-      "Hydro": 0.0491,
+      "Coal": 0.0495,
+      "Gas": 0.5957,
+      "Hydro": 0.0546,
       "Nuclear": 0.0422,
-      "Other Fossil": 0.1141,
-      "Other Renewables": 0.0118,
-      "Solar": 0.0464,
-      "Wind": 0.0776
+      "Other Fossil": 0.1152,
+      "Other Renewables": 0.0119,
+      "Solar": 0.0527,
+      "Wind": 0.0778
     }
   },
   "MY": {
@@ -10642,25 +10642,25 @@
       "Wind": 0
     },
     "2024": {
-      "Bioenergy": 0.0236,
-      "Coal": 0.4377,
-      "Gas": 0.3434,
-      "Hydro": 0.1746,
+      "Bioenergy": 0.0247,
+      "Coal": 0.4322,
+      "Gas": 0.341,
+      "Hydro": 0.1815,
       "Nuclear": 0,
-      "Other Fossil": 0.0043,
+      "Other Fossil": 0.0044,
       "Other Renewables": 0,
-      "Solar": 0.0164,
+      "Solar": 0.0162,
       "Wind": 0
     },
     "2025": {
-      "Bioenergy": 0.0235,
-      "Coal": 0.4532,
-      "Gas": 0.3251,
-      "Hydro": 0.1743,
+      "Bioenergy": 0.0255,
+      "Coal": 0.4447,
+      "Gas": 0.3202,
+      "Hydro": 0.1862,
       "Nuclear": 0,
-      "Other Fossil": 0.0047,
+      "Other Fossil": 0.0046,
       "Other Renewables": 0,
-      "Solar": 0.0192,
+      "Solar": 0.0188,
       "Wind": 0
     }
   },
@@ -11128,14 +11128,14 @@
     },
     "2025": {
       "Bioenergy": 0.1682,
-      "Coal": 0.0028,
-      "Gas": 0.019,
-      "Hydro": 0.0878,
+      "Coal": 0.0025,
+      "Gas": 0.0189,
+      "Hydro": 0.0875,
       "Nuclear": 0.0019,
-      "Other Fossil": 0.398,
+      "Other Fossil": 0.3981,
       "Other Renewables": 0.1562,
-      "Solar": 0.0132,
-      "Wind": 0.153
+      "Solar": 0.0135,
+      "Wind": 0.1532
     }
   },
   "NL": {
@@ -11206,15 +11206,15 @@
       "Wind": 0.2732
     },
     "2025": {
-      "Bioenergy": 0.0705,
-      "Coal": 0.1379,
-      "Gas": 0.3993,
+      "Bioenergy": 0.0669,
+      "Coal": 0.123,
+      "Gas": 0.4108,
       "Hydro": 0.0009,
-      "Nuclear": 0.0304,
-      "Other Fossil": 0.0062,
-      "Other Renewables": 0.0037,
-      "Solar": 0.1478,
-      "Wind": 0.2033
+      "Nuclear": 0.0237,
+      "Other Fossil": 0.0059,
+      "Other Renewables": 0.0043,
+      "Solar": 0.1645,
+      "Wind": 0.2
     }
   },
   "NO": {
@@ -11287,13 +11287,13 @@
     "2025": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.0076,
-      "Hydro": 0.9,
+      "Gas": 0.0074,
+      "Hydro": 0.9051,
       "Nuclear": 0,
-      "Other Fossil": 0.0006,
-      "Other Renewables": 0.0026,
+      "Other Fossil": 0.0008,
+      "Other Renewables": 0.0025,
       "Solar": 0,
-      "Wind": 0.0892
+      "Wind": 0.0841
     }
   },
   "NP": {
@@ -11364,15 +11364,15 @@
       "Wind": 0.0166
     },
     "2025": {
-      "Bioenergy": 0.0045,
-      "Coal": 0.1147,
-      "Gas": 0.0207,
-      "Hydro": 0.7979,
-      "Nuclear": 0.0115,
-      "Other Fossil": 0.0015,
+      "Bioenergy": 0.0044,
+      "Coal": 0.1126,
+      "Gas": 0.0205,
+      "Hydro": 0.7982,
+      "Nuclear": 0.0118,
+      "Other Fossil": 0.0014,
       "Other Renewables": 0.0011,
-      "Solar": 0.0287,
-      "Wind": 0.0193
+      "Solar": 0.0298,
+      "Wind": 0.0201
     }
   },
   "NR": {
@@ -12233,15 +12233,15 @@
       "Wind": 0.1507
     },
     "2025": {
-      "Bioenergy": 0.0187,
-      "Coal": 0.5634,
-      "Gas": 0.1236,
-      "Hydro": 0.0096,
+      "Bioenergy": 0.019,
+      "Coal": 0.5518,
+      "Gas": 0.1248,
+      "Hydro": 0.0097,
       "Nuclear": 0,
-      "Other Fossil": 0.0555,
-      "Other Renewables": 0.0021,
-      "Solar": 0.0853,
-      "Wind": 0.1417
+      "Other Fossil": 0.0558,
+      "Other Renewables": 0.0022,
+      "Solar": 0.0954,
+      "Wind": 0.1413
     }
   },
   "PM": {
@@ -12392,14 +12392,14 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Coal": 0.1583,
-      "Gas": 0.4667,
+      "Coal": 0.1666,
+      "Gas": 0.4123,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": 0.35,
+      "Other Fossil": 0.3882,
       "Other Renewables": 0,
-      "Solar": 0.0083,
-      "Wind": 0.0167
+      "Solar": 0.0154,
+      "Wind": 0.0176
     }
   },
   "PS": {
@@ -12549,15 +12549,15 @@
       "Wind": 0.3021
     },
     "2025": {
-      "Bioenergy": 0.0526,
-      "Coal": 0.0101,
-      "Gas": 0.1344,
-      "Hydro": 0.3714,
-      "Nuclear": 0.0138,
-      "Other Fossil": 0.0049,
-      "Other Renewables": 0.0004,
-      "Solar": 0.0887,
-      "Wind": 0.3238
+      "Bioenergy": 0.0535,
+      "Coal": 0.0135,
+      "Gas": 0.1352,
+      "Hydro": 0.368,
+      "Nuclear": 0.0194,
+      "Other Fossil": 0.0055,
+      "Other Renewables": 0.0006,
+      "Solar": 0.0951,
+      "Wind": 0.3092
     }
   },
   "PY": {
@@ -12865,15 +12865,15 @@
       "Wind": 0.1188
     },
     "2025": {
-      "Bioenergy": 0.0119,
-      "Coal": 0.1421,
-      "Gas": 0.2239,
-      "Hydro": 0.2111,
-      "Nuclear": 0.2114,
-      "Other Fossil": 0.0019,
-      "Other Renewables": 0.0005,
-      "Solar": 0.069,
-      "Wind": 0.1282
+      "Bioenergy": 0.0114,
+      "Coal": 0.139,
+      "Gas": 0.2021,
+      "Hydro": 0.2246,
+      "Nuclear": 0.2159,
+      "Other Fossil": 0.0021,
+      "Other Renewables": 0.0006,
+      "Solar": 0.078,
+      "Wind": 0.1262
     }
   },
   "RS": {
@@ -12944,15 +12944,15 @@
       "Wind": 0.0375
     },
     "2025": {
-      "Bioenergy": 0.008,
-      "Coal": 0.616,
-      "Gas": 0.0632,
-      "Hydro": 0.2613,
-      "Nuclear": 0.0017,
-      "Other Fossil": 0.0064,
+      "Bioenergy": 0.0075,
+      "Coal": 0.6008,
+      "Gas": 0.0586,
+      "Hydro": 0.2797,
+      "Nuclear": 0.0022,
+      "Other Fossil": 0.0067,
       "Other Renewables": 0.0001,
-      "Solar": 0.0004,
-      "Wind": 0.0429
+      "Solar": 0.0008,
+      "Wind": 0.0437
     }
   },
   "RU": {
@@ -13024,14 +13024,14 @@
     },
     "2025": {
       "Bioenergy": 0.0008,
-      "Coal": 0.2021,
-      "Gas": 0.4888,
-      "Hydro": 0.134,
-      "Nuclear": 0.1587,
-      "Other Fossil": 0.0117,
+      "Coal": 0.1989,
+      "Gas": 0.481,
+      "Hydro": 0.1371,
+      "Nuclear": 0.1659,
+      "Other Fossil": 0.0115,
       "Other Renewables": 0,
-      "Solar": 0.0006,
-      "Wind": 0.0033
+      "Solar": 0.001,
+      "Wind": 0.0038
     }
   },
   "RW": {
@@ -13497,15 +13497,15 @@
       "Wind": 0.2507
     },
     "2025": {
-      "Bioenergy": 0.0417,
+      "Bioenergy": 0.0418,
       "Coal": 0,
       "Gas": 0,
-      "Hydro": 0.3992,
-      "Nuclear": 0.29,
+      "Hydro": 0.4102,
+      "Nuclear": 0.2885,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.006,
-      "Wind": 0.263
+      "Solar": 0.008,
+      "Wind": 0.2515
     }
   },
   "SG": {
@@ -13579,12 +13579,12 @@
       "Bioenergy": 0.0001,
       "Coal": 0.0022,
       "Gas": 0.9539,
-      "Hydro": 0.0003,
+      "Hydro": 0.0004,
       "Nuclear": 0.0002,
       "Other Fossil": 0.0202,
       "Other Renewables": 0,
       "Solar": 0.0226,
-      "Wind": 0.0003
+      "Wind": 0.0004
     }
   },
   "SH": {
@@ -13734,14 +13734,14 @@
       "Wind": 0.0022
     },
     "2025": {
-      "Bioenergy": 0.0075,
-      "Coal": 0.2218,
-      "Gas": 0.0554,
-      "Hydro": 0.2445,
-      "Nuclear": 0.3751,
+      "Bioenergy": 0.0078,
+      "Coal": 0.2021,
+      "Gas": 0.0517,
+      "Hydro": 0.2518,
+      "Nuclear": 0.3826,
       "Other Fossil": 0.0001,
       "Other Renewables": 0,
-      "Solar": 0.0948,
+      "Solar": 0.103,
       "Wind": 0.0007
     }
   },
@@ -13813,14 +13813,14 @@
       "Wind": 0
     },
     "2025": {
-      "Bioenergy": 0.0273,
-      "Coal": 0.004,
-      "Gas": 0.1101,
-      "Hydro": 0.0959,
-      "Nuclear": 0.6787,
-      "Other Fossil": 0.0526,
-      "Other Renewables": 0.0162,
-      "Solar": 0.0152,
+      "Bioenergy": 0.0303,
+      "Coal": 0.0031,
+      "Gas": 0.1071,
+      "Hydro": 0.0979,
+      "Nuclear": 0.6759,
+      "Other Fossil": 0.0521,
+      "Other Renewables": 0.0167,
+      "Solar": 0.0168,
       "Wind": 0
     }
   },
@@ -14831,8 +14831,8 @@
     "2024": {
       "Bioenergy": 0.0609,
       "Coal": 0.2219,
-      "Gas": 0.5979,
-      "Hydro": 0.0457,
+      "Gas": 0.5978,
+      "Hydro": 0.0458,
       "Nuclear": 0.0076,
       "Other Fossil": 0.0019,
       "Other Renewables": 0.0008,
@@ -14840,15 +14840,15 @@
       "Wind": 0.0268
     },
     "2025": {
-      "Bioenergy": 0.0853,
-      "Coal": 0.2057,
-      "Gas": 0.5664,
-      "Hydro": 0.0605,
-      "Nuclear": 0.0082,
-      "Other Fossil": 0.0011,
-      "Other Renewables": 0.0008,
-      "Solar": 0.0403,
-      "Wind": 0.0316
+      "Bioenergy": 0.0637,
+      "Coal": 0.2214,
+      "Gas": 0.5657,
+      "Hydro": 0.0547,
+      "Nuclear": 0.0077,
+      "Other Fossil": 0.0014,
+      "Other Renewables": 0.0007,
+      "Solar": 0.0516,
+      "Wind": 0.0331
     }
   },
   "TJ": {
@@ -15314,15 +15314,15 @@
       "Wind": 0.107
     },
     "2025": {
-      "Bioenergy": 0.0253,
-      "Coal": 0.3443,
-      "Gas": 0.2285,
-      "Hydro": 0.1723,
+      "Bioenergy": 0.0248,
+      "Coal": 0.3307,
+      "Gas": 0.2231,
+      "Hydro": 0.1906,
       "Nuclear": 0.0002,
-      "Other Fossil": 0.0029,
-      "Other Renewables": 0.0337,
-      "Solar": 0.0807,
-      "Wind": 0.112
+      "Other Fossil": 0.0028,
+      "Other Renewables": 0.0336,
+      "Solar": 0.0868,
+      "Wind": 0.1072
     }
   },
   "TT": {
@@ -15472,15 +15472,15 @@
       "Wind": 0.0362
     },
     "2025": {
-      "Bioenergy": 0.001,
-      "Coal": 0.3307,
-      "Gas": 0.4698,
-      "Hydro": 0.0141,
+      "Bioenergy": 0.0009,
+      "Coal": 0.3413,
+      "Gas": 0.4642,
+      "Hydro": 0.0152,
       "Nuclear": 0.0338,
-      "Other Fossil": 0.0291,
+      "Other Fossil": 0.0293,
       "Other Renewables": 0,
-      "Solar": 0.0443,
-      "Wind": 0.0771
+      "Solar": 0.0477,
+      "Wind": 0.0676
     }
   },
   "TZ": {
@@ -15788,15 +15788,15 @@
       "Wind": 0.1035
     },
     "2025": {
-      "Bioenergy": 0.0105,
-      "Coal": 0.1692,
-      "Gas": 0.3637,
-      "Hydro": 0.06,
-      "Nuclear": 0.1797,
+      "Bioenergy": 0.0104,
+      "Coal": 0.1691,
+      "Gas": 0.3657,
+      "Hydro": 0.0604,
+      "Nuclear": 0.1782,
       "Other Fossil": 0.0085,
       "Other Renewables": 0.0041,
-      "Solar": 0.0737,
-      "Wind": 0.1307
+      "Solar": 0.0768,
+      "Wind": 0.1269
     }
   },
   "UY": {
@@ -15867,15 +15867,15 @@
       "Wind": 0.3322
     },
     "2025": {
-      "Bioenergy": 0.1428,
-      "Coal": 0.0033,
-      "Gas": 0.0463,
-      "Hydro": 0.4122,
-      "Nuclear": 0.0022,
-      "Other Fossil": 0.0199,
+      "Bioenergy": 0.1502,
+      "Coal": 0.0029,
+      "Gas": 0.0442,
+      "Hydro": 0.3967,
+      "Nuclear": 0.0023,
+      "Other Fossil": 0.018,
       "Other Renewables": 0.0006,
-      "Solar": 0.0488,
-      "Wind": 0.3238
+      "Solar": 0.0504,
+      "Wind": 0.3348
     }
   },
   "UZ": {
@@ -15947,14 +15947,14 @@
     },
     "2025": {
       "Bioenergy": 0.0004,
-      "Coal": 0.07,
+      "Coal": 0.0698,
       "Gas": 0.8122,
       "Hydro": 0.1013,
       "Nuclear": 0.0011,
       "Other Fossil": 0.0111,
       "Other Renewables": 0.0001,
-      "Solar": 0.002,
-      "Wind": 0.0017
+      "Solar": 0.0021,
+      "Wind": 0.0018
     }
   },
   "VC": {
@@ -16557,7 +16557,7 @@
     },
     "2023": {
       "Bioenergy": 0.0037,
-      "Coal": 0.7782,
+      "Coal": 0.7781,
       "Gas": 0.0326,
       "Hydro": 0.0751,
       "Nuclear": 0.0264,
@@ -16578,15 +16578,15 @@
       "Wind": 0.0647
     },
     "2025": {
-      "Bioenergy": 0.0084,
-      "Coal": 0.6803,
-      "Gas": 0.0746,
-      "Hydro": 0.0686,
-      "Nuclear": 0.0598,
-      "Other Fossil": 0.0073,
-      "Other Renewables": 0.0019,
-      "Solar": 0.0179,
-      "Wind": 0.0813
+      "Bioenergy": 0.0086,
+      "Coal": 0.6946,
+      "Gas": 0.0748,
+      "Hydro": 0.0644,
+      "Nuclear": 0.0599,
+      "Other Fossil": 0.007,
+      "Other Renewables": 0.002,
+      "Solar": 0.0203,
+      "Wind": 0.0682
     }
   },
   "YE": {