npm - @digital4better/data - Versions diffs - 1.2.10 → 1.2.12 - Mend

@digital4better/data 1.2.10 → 1.2.12

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

package/data/cloud/azure-vms.csv +6 -0
package/data/cloud/azure-vms.json +96 -0
package/data/cloud/cpus.csv +1 -0
package/data/cloud/cpus.json +15 -0
package/data/factor/continent-monthly-green.csv +240 -240
package/data/factor/continent-monthly-green.json +1661 -1661
package/data/factor/continent-monthly.csv +227 -227
package/data/factor/continent-monthly.json +1566 -1566
package/data/factor/continent-yearly-green.csv +28 -28
package/data/factor/continent-yearly-green.json +211 -211
package/data/factor/continent-yearly.csv +27 -27
package/data/factor/continent-yearly.json +198 -198
package/data/factor/country-monthly-green.csv +1283 -1283
package/data/factor/country-monthly-green.json +10971 -10971
package/data/factor/country-monthly.csv +1325 -1325
package/data/factor/country-monthly.json +10122 -10122
package/data/factor/country-yearly-green.csv +225 -225
package/data/factor/country-yearly-green.json +1762 -1762
package/data/factor/country-yearly.csv +228 -228
package/data/factor/country-yearly.json +1735 -1735
package/data/factor/subdivision-monthly-green.csv +39 -39
package/data/factor/subdivision-monthly-green.json +318 -318
package/data/factor/subdivision-monthly.csv +39 -39
package/data/factor/subdivision-monthly.json +351 -351
package/data/factor/subdivision-yearly-green.csv +26 -26
package/data/factor/subdivision-yearly-green.json +197 -197
package/data/factor/subdivision-yearly.csv +26 -26
package/data/factor/subdivision-yearly.json +229 -229
package/data/factor/world-monthly-green.csv +73 -73
package/data/factor/world-monthly-green.json +657 -657
package/data/factor/world-monthly.csv +73 -73
package/data/factor/world-monthly.json +657 -657
package/data/factor/world-yearly-green.csv +7 -7
package/data/factor/world-yearly-green.json +63 -63
package/data/factor/world-yearly.csv +7 -7
package/data/factor/world-yearly.json +63 -63
package/data/mix/continent-monthly-green.csv +154 -154
package/data/mix/continent-monthly-green.json +550 -550
package/data/mix/continent-monthly.csv +154 -154
package/data/mix/continent-monthly.json +1044 -1044
package/data/mix/continent-yearly-green.csv +20 -20
package/data/mix/continent-yearly-green.json +69 -69
package/data/mix/continent-yearly.csv +20 -20
package/data/mix/continent-yearly.json +138 -138
package/data/mix/country-monthly-green.csv +989 -989
package/data/mix/country-monthly-green.json +2953 -2953
package/data/mix/country-monthly.csv +989 -989
package/data/mix/country-monthly.json +4066 -4066
package/data/mix/country-yearly-green.csv +159 -159
package/data/mix/country-yearly-green.json +387 -387
package/data/mix/country-yearly.csv +159 -159
package/data/mix/country-yearly.json +625 -625
package/data/mix/subdivision-monthly-green.csv +30 -30
package/data/mix/subdivision-monthly-green.json +42 -42
package/data/mix/subdivision-monthly.csv +30 -30
package/data/mix/subdivision-monthly.json +87 -87
package/data/mix/subdivision-yearly-green.csv +18 -18
package/data/mix/subdivision-yearly-green.json +17 -17
package/data/mix/subdivision-yearly.csv +18 -18
package/data/mix/subdivision-yearly.json +42 -42
package/data/mix/world-monthly-green.csv +73 -73
package/data/mix/world-monthly-green.json +292 -292
package/data/mix/world-monthly.csv +73 -73
package/data/mix/world-monthly.json +654 -654
package/data/mix/world-yearly-green.csv +7 -7
package/data/mix/world-yearly-green.json +28 -28
package/data/mix/world-yearly.csv +7 -7
package/data/mix/world-yearly.json +62 -62
package/package.json +1 -1

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

@@ -1,89 +1,89 @@
 {
   "AE": {
     "2019": {
-      "Bioenergy": 0,
-      "Coal": 0,
-      "Gas": 0.9736,
-      "Hydro": 0,
-      "Nuclear": 0,
-      "Other Fossil": 0,
+      "Bioenergy": 0.0002,
+      "Coal": 0.0176,
+      "Gas": 0.7027,
+      "Hydro": 0.0315,
+      "Nuclear": 0.005,
+      "Other Fossil": 0.2339,
       "Other Renewables": 0,
-      "Solar": 0.0264,
-      "Wind": 0
+      "Solar": 0.0077,
+      "Wind": 0.0014
     },
     "2020": {
-      "Bioenergy": 0,
-      "Coal": 0,
-      "Gas": 0.9736,
-      "Hydro": 0,
-      "Nuclear": 0,
-      "Other Fossil": 0,
+      "Bioenergy": 0.0002,
+      "Coal": 0.0176,
+      "Gas": 0.7027,
+      "Hydro": 0.0315,
+      "Nuclear": 0.005,
+      "Other Fossil": 0.2339,
       "Other Renewables": 0,
-      "Solar": 0.0264,
-      "Wind": 0
+      "Solar": 0.0077,
+      "Wind": 0.0014
     },
     "2021": {
-      "Bioenergy": 0,
-      "Coal": 0,
-      "Gas": 0.9736,
-      "Hydro": 0,
-      "Nuclear": 0,
-      "Other Fossil": 0,
+      "Bioenergy": 0.0002,
+      "Coal": 0.0176,
+      "Gas": 0.7027,
+      "Hydro": 0.0315,
+      "Nuclear": 0.005,
+      "Other Fossil": 0.2339,
       "Other Renewables": 0,
-      "Solar": 0.0264,
-      "Wind": 0
+      "Solar": 0.0077,
+      "Wind": 0.0014
     },
     "2022": {
-      "Bioenergy": 0,
-      "Coal": 0,
-      "Gas": 0.9736,
-      "Hydro": 0,
-      "Nuclear": 0,
-      "Other Fossil": 0,
+      "Bioenergy": 0.0002,
+      "Coal": 0.0176,
+      "Gas": 0.7027,
+      "Hydro": 0.0315,
+      "Nuclear": 0.005,
+      "Other Fossil": 0.2339,
       "Other Renewables": 0,
-      "Solar": 0.0264,
-      "Wind": 0
+      "Solar": 0.0077,
+      "Wind": 0.0014
     },
     "2023": {
-      "Bioenergy": 0,
-      "Coal": 0,
-      "Gas": 0.9736,
-      "Hydro": 0,
-      "Nuclear": 0,
-      "Other Fossil": 0,
+      "Bioenergy": 0.0002,
+      "Coal": 0.0176,
+      "Gas": 0.7027,
+      "Hydro": 0.0315,
+      "Nuclear": 0.005,
+      "Other Fossil": 0.2339,
       "Other Renewables": 0,
-      "Solar": 0.0264,
-      "Wind": 0
+      "Solar": 0.0077,
+      "Wind": 0.0014
     },
     "2024": {
-      "Bioenergy": 0,
-      "Coal": 0,
-      "Gas": 0.9736,
-      "Hydro": 0,
-      "Nuclear": 0,
-      "Other Fossil": 0,
+      "Bioenergy": 0.0002,
+      "Coal": 0.0176,
+      "Gas": 0.7027,
+      "Hydro": 0.0315,
+      "Nuclear": 0.005,
+      "Other Fossil": 0.2339,
       "Other Renewables": 0,
-      "Solar": 0.0264,
-      "Wind": 0
+      "Solar": 0.0077,
+      "Wind": 0.0014
     },
     "2025": {
-      "Bioenergy": 0,
-      "Coal": 0,
-      "Gas": 0.9736,
-      "Hydro": 0,
-      "Nuclear": 0,
-      "Other Fossil": 0,
+      "Bioenergy": 0.0002,
+      "Coal": 0.0176,
+      "Gas": 0.7027,
+      "Hydro": 0.0315,
+      "Nuclear": 0.005,
+      "Other Fossil": 0.2339,
       "Other Renewables": 0,
-      "Solar": 0.0264,
-      "Wind": 0
+      "Solar": 0.0077,
+      "Wind": 0.0014
     }
   },
   "AF": {
     "2019": {
-      "Bioenergy": 0.0116,
-      "Coal": 0.4631,
-      "Gas": 0.0932,
-      "Hydro": 0.2981,
+      "Bioenergy": 0.0119,
+      "Coal": 0.463,
+      "Gas": 0.0931,
+      "Hydro": 0.2982,
       "Nuclear": 0.0412,
       "Other Fossil": 0.0237,
       "Other Renewables": 0.0043,
@@ -91,43 +91,43 @@
       "Wind": 0.0317
     },
     "2020": {
-      "Bioenergy": 0.0131,
-      "Coal": 0.4556,
-      "Gas": 0.0908,
-      "Hydro": 0.3004,
-      "Nuclear": 0.0411,
+      "Bioenergy": 0.0133,
+      "Coal": 0.4554,
+      "Gas": 0.0907,
+      "Hydro": 0.3006,
+      "Nuclear": 0.0412,
       "Other Fossil": 0.0228,
       "Other Renewables": 0.0037,
-      "Solar": 0.0374,
+      "Solar": 0.0373,
       "Wind": 0.035
     },
     "2021": {
-      "Bioenergy": 0.0146,
-      "Coal": 0.4537,
-      "Gas": 0.0859,
-      "Hydro": 0.2921,
+      "Bioenergy": 0.0148,
+      "Coal": 0.4535,
+      "Gas": 0.0858,
+      "Hydro": 0.2922,
       "Nuclear": 0.0412,
-      "Other Fossil": 0.0232,
+      "Other Fossil": 0.0231,
       "Other Renewables": 0.0038,
-      "Solar": 0.0416,
+      "Solar": 0.0415,
       "Wind": 0.044
     },
     "2022": {
-      "Bioenergy": 0.0159,
-      "Coal": 0.4443,
-      "Gas": 0.0818,
-      "Hydro": 0.2921,
+      "Bioenergy": 0.0161,
+      "Coal": 0.4442,
+      "Gas": 0.0817,
+      "Hydro": 0.2923,
       "Nuclear": 0.041,
       "Other Fossil": 0.0233,
       "Other Renewables": 0.004,
-      "Solar": 0.0487,
+      "Solar": 0.0486,
       "Wind": 0.0488
     },
     "2023": {
-      "Bioenergy": 0.0163,
-      "Coal": 0.4475,
+      "Bioenergy": 0.0165,
+      "Coal": 0.4474,
       "Gas": 0.0779,
-      "Hydro": 0.2813,
+      "Hydro": 0.2814,
       "Nuclear": 0.0411,
       "Other Fossil": 0.0213,
       "Other Renewables": 0.004,
@@ -135,10 +135,10 @@
       "Wind": 0.054
     },
     "2024": {
-      "Bioenergy": 0.0157,
-      "Coal": 0.4347,
-      "Gas": 0.0754,
-      "Hydro": 0.2843,
+      "Bioenergy": 0.0158,
+      "Coal": 0.4345,
+      "Gas": 0.0751,
+      "Hydro": 0.2844,
       "Nuclear": 0.0404,
       "Other Fossil": 0.0202,
       "Other Renewables": 0.0041,
@@ -146,15 +146,15 @@
       "Wind": 0.0562
     },
     "2025": {
-      "Bioenergy": 0.0173,
-      "Coal": 0.451,
-      "Gas": 0.0759,
-      "Hydro": 0.262,
-      "Nuclear": 0.0426,
-      "Other Fossil": 0.0203,
-      "Other Renewables": 0.0039,
-      "Solar": 0.0643,
-      "Wind": 0.0626
+      "Bioenergy": 0.0176,
+      "Coal": 0.4501,
+      "Gas": 0.0742,
+      "Hydro": 0.2627,
+      "Nuclear": 0.0429,
+      "Other Fossil": 0.0202,
+      "Other Renewables": 0.004,
+      "Solar": 0.0654,
+      "Wind": 0.0628
     }
   },
   "AG": {
@@ -294,10 +294,10 @@
     },
     "2024": {
       "Bioenergy": 0.0089,
-      "Coal": 0.0422,
+      "Coal": 0.0423,
       "Gas": 0.0716,
-      "Hydro": 0.7382,
-      "Nuclear": 0.0639,
+      "Hydro": 0.738,
+      "Nuclear": 0.064,
       "Other Fossil": 0.0064,
       "Other Renewables": 0.002,
       "Solar": 0.0263,
@@ -305,14 +305,14 @@
     },
     "2025": {
       "Bioenergy": 0.0086,
-      "Coal": 0.046,
-      "Gas": 0.084,
-      "Hydro": 0.7304,
-      "Nuclear": 0.0649,
+      "Coal": 0.0464,
+      "Gas": 0.0835,
+      "Hydro": 0.7303,
+      "Nuclear": 0.0651,
       "Other Fossil": 0.0067,
       "Other Renewables": 0.0019,
       "Solar": 0.0114,
-      "Wind": 0.046
+      "Wind": 0.0459
     }
   },
   "AM": {
@@ -350,7 +350,7 @@
       "Wind": 0
     },
     "2022": {
-      "Bioenergy": 0.0001,
+      "Bioenergy": 0.0002,
       "Coal": 0.0042,
       "Gas": 0.4313,
       "Hydro": 0.2185,
@@ -367,13 +367,13 @@
       "Hydro": 0.1955,
       "Nuclear": 0.3166,
       "Other Fossil": 0.0001,
-      "Other Renewables": 0.0001,
+      "Other Renewables": 0,
       "Solar": 0.0454,
       "Wind": 0.0007
     },
     "2024": {
       "Bioenergy": 0.0003,
-      "Coal": 0.0091,
+      "Coal": 0.0092,
       "Gas": 0.4239,
       "Hydro": 0.2249,
       "Nuclear": 0.2781,
@@ -690,7 +690,7 @@
     "2024": {
       "Bioenergy": 0.0271,
       "Coal": 0.0026,
-      "Gas": 0.09,
+      "Gas": 0.0899,
       "Hydro": 0.6241,
       "Nuclear": 0.0036,
       "Other Fossil": 0.0151,
@@ -700,8 +700,8 @@
     },
     "2025": {
       "Bioenergy": 0.0342,
-      "Coal": 0.0203,
-      "Gas": 0.2711,
+      "Coal": 0.0205,
+      "Gas": 0.2709,
       "Hydro": 0.4429,
       "Nuclear": 0.0287,
       "Other Fossil": 0.0166,
@@ -1107,7 +1107,7 @@
   },
   "BD": {
     "2019": {
-      "Bioenergy": 0.0014,
+      "Bioenergy": 0.0015,
       "Coal": 0.0845,
       "Gas": 0.7008,
       "Hydro": 0.0251,
@@ -1122,7 +1122,7 @@
       "Coal": 0.1165,
       "Gas": 0.6592,
       "Hydro": 0.0233,
-      "Nuclear": 0.0048,
+      "Nuclear": 0.0049,
       "Other Fossil": 0.1859,
       "Other Renewables": 0.0004,
       "Solar": 0.0041,
@@ -1131,7 +1131,7 @@
     "2021": {
       "Bioenergy": 0.0016,
       "Coal": 0.112,
-      "Gas": 0.6113,
+      "Gas": 0.6112,
       "Hydro": 0.0196,
       "Nuclear": 0.0046,
       "Other Fossil": 0.239,
@@ -1151,7 +1151,7 @@
       "Wind": 0.0059
     },
     "2023": {
-      "Bioenergy": 0.0035,
+      "Bioenergy": 0.0036,
       "Coal": 0.2697,
       "Gas": 0.5054,
       "Hydro": 0.0271,
@@ -1163,25 +1163,25 @@
     },
     "2024": {
       "Bioenergy": 0.0032,
-      "Coal": 0.3639,
-      "Gas": 0.4477,
-      "Hydro": 0.0284,
-      "Nuclear": 0.0082,
-      "Other Fossil": 0.1144,
+      "Coal": 0.3647,
+      "Gas": 0.4498,
+      "Hydro": 0.0281,
+      "Nuclear": 0.0083,
+      "Other Fossil": 0.1112,
       "Other Renewables": 0.0008,
-      "Solar": 0.022,
+      "Solar": 0.0224,
       "Wind": 0.0114
     },
     "2025": {
-      "Bioenergy": 0.0035,
-      "Coal": 0.3722,
-      "Gas": 0.4652,
-      "Hydro": 0.024,
-      "Nuclear": 0.0085,
-      "Other Fossil": 0.0887,
+      "Bioenergy": 0.0037,
+      "Coal": 0.3866,
+      "Gas": 0.4999,
+      "Hydro": 0.0192,
+      "Nuclear": 0.009,
+      "Other Fossil": 0.0377,
       "Other Renewables": 0.0008,
-      "Solar": 0.0246,
-      "Wind": 0.0125
+      "Solar": 0.0301,
+      "Wind": 0.0131
     }
   },
   "BE": {
@@ -1242,7 +1242,7 @@
     },
     "2024": {
       "Bioenergy": 0.0117,
-      "Coal": 0.018,
+      "Coal": 0.0181,
       "Gas": 0.166,
       "Hydro": 0.025,
       "Nuclear": 0.3965,
@@ -1253,14 +1253,14 @@
     },
     "2025": {
       "Bioenergy": 0.0126,
-      "Coal": 0.0263,
-      "Gas": 0.2432,
+      "Coal": 0.0266,
+      "Gas": 0.2429,
       "Hydro": 0.0297,
-      "Nuclear": 0.4032,
+      "Nuclear": 0.4033,
       "Other Fossil": 0.0842,
       "Other Renewables": 0.0011,
       "Solar": 0.0318,
-      "Wind": 0.1679
+      "Wind": 0.1678
     }
   },
   "BF": {
@@ -1400,9 +1400,9 @@
     },
     "2024": {
       "Bioenergy": 0.0044,
-      "Coal": 0.265,
-      "Gas": 0.0638,
-      "Hydro": 0.0821,
+      "Coal": 0.2651,
+      "Gas": 0.0639,
+      "Hydro": 0.082,
       "Nuclear": 0.4138,
       "Other Fossil": 0.0007,
       "Other Renewables": 0.0002,
@@ -2341,7 +2341,7 @@
       "Gas": 0.1023,
       "Hydro": 0.519,
       "Nuclear": 0.0088,
-      "Other Fossil": 0.1059,
+      "Other Fossil": 0.1058,
       "Other Renewables": 0.0026,
       "Solar": 0.0355,
       "Wind": 0.038
@@ -2350,23 +2350,23 @@
       "Bioenergy": 0.171,
       "Coal": 0.0156,
       "Gas": 0.1042,
-      "Hydro": 0.5109,
+      "Hydro": 0.511,
       "Nuclear": 0.0092,
-      "Other Fossil": 0.1037,
+      "Other Fossil": 0.1036,
       "Other Renewables": 0.0024,
       "Solar": 0.042,
       "Wind": 0.041
     },
     "2025": {
       "Bioenergy": 0.1699,
-      "Coal": 0.0139,
-      "Gas": 0.0936,
-      "Hydro": 0.5174,
+      "Coal": 0.014,
+      "Gas": 0.094,
+      "Hydro": 0.5176,
       "Nuclear": 0.0077,
-      "Other Fossil": 0.1013,
+      "Other Fossil": 0.1007,
       "Other Renewables": 0.0023,
       "Solar": 0.0487,
-      "Wind": 0.045
+      "Wind": 0.0451
     }
   },
   "CA": {
@@ -2431,7 +2431,7 @@
       "Gas": 0.1486,
       "Hydro": 0.5572,
       "Nuclear": 0.1342,
-      "Other Fossil": 0.0105,
+      "Other Fossil": 0.0106,
       "Other Renewables": 0.0005,
       "Solar": 0.009,
       "Wind": 0.0765
@@ -2440,9 +2440,9 @@
       "Bioenergy": 0.0161,
       "Coal": 0.0465,
       "Gas": 0.1462,
-      "Hydro": 0.5562,
+      "Hydro": 0.5561,
       "Nuclear": 0.1321,
-      "Other Fossil": 0.0103,
+      "Other Fossil": 0.0105,
       "Other Renewables": 0.0006,
       "Solar": 0.0036,
       "Wind": 0.0883
@@ -2744,9 +2744,9 @@
     "2024": {
       "Bioenergy": 0.0004,
       "Coal": 0.002,
-      "Gas": 0.0036,
+      "Gas": 0.0035,
       "Hydro": 0.5954,
-      "Nuclear": 0.2934,
+      "Nuclear": 0.2935,
       "Other Fossil": 0.0463,
       "Other Renewables": 0.0001,
       "Solar": 0.0553,
@@ -2754,8 +2754,8 @@
     },
     "2025": {
       "Bioenergy": 0.0025,
-      "Coal": 0.0135,
-      "Gas": 0.0247,
+      "Coal": 0.0136,
+      "Gas": 0.0245,
       "Hydro": 0.51,
       "Nuclear": 0.3544,
       "Other Fossil": 0.0508,
@@ -3149,13 +3149,13 @@
     },
     "2025": {
       "Bioenergy": 0.0203,
-      "Coal": 0.617,
+      "Coal": 0.6169,
       "Gas": 0.0298,
       "Hydro": 0.0929,
       "Nuclear": 0.0472,
       "Other Fossil": 0.0018,
       "Other Renewables": 0,
-      "Solar": 0.0803,
+      "Solar": 0.0804,
       "Wind": 0.1108
     }
   },
@@ -3849,7 +3849,7 @@
     },
     "2024": {
       "Bioenergy": 0.1066,
-      "Coal": 0.0989,
+      "Coal": 0.099,
       "Gas": 0.0711,
       "Hydro": 0.0192,
       "Nuclear": 0.0215,
@@ -3860,8 +3860,8 @@
     },
     "2025": {
       "Bioenergy": 0.1375,
-      "Coal": 0.1002,
-      "Gas": 0.092,
+      "Coal": 0.1003,
+      "Gas": 0.0919,
       "Hydro": 0.017,
       "Nuclear": 0.0222,
       "Other Fossil": 0.0339,
@@ -4161,7 +4161,7 @@
       "Other Fossil": 0.2264,
       "Other Renewables": 0.0002,
       "Solar": 0.0021,
-      "Wind": 0.0087
+      "Wind": 0.0088
     },
     "2024": {
       "Bioenergy": 0.0151,
@@ -4176,11 +4176,11 @@
     },
     "2025": {
       "Bioenergy": 0.0298,
-      "Coal": 0.0023,
+      "Coal": 0.0024,
       "Gas": 0.0576,
-      "Hydro": 0.4513,
+      "Hydro": 0.4514,
       "Nuclear": 0.0013,
-      "Other Fossil": 0.4391,
+      "Other Fossil": 0.439,
       "Other Renewables": 0.0004,
       "Solar": 0.0063,
       "Wind": 0.0118
@@ -4244,10 +4244,10 @@
     },
     "2024": {
       "Bioenergy": 0.0677,
-      "Coal": 0.0508,
-      "Gas": 0.0867,
-      "Hydro": 0.0661,
-      "Nuclear": 0.0753,
+      "Coal": 0.051,
+      "Gas": 0.0866,
+      "Hydro": 0.0659,
+      "Nuclear": 0.0754,
       "Other Fossil": 0.3045,
       "Other Renewables": 0.0024,
       "Solar": 0.1442,
@@ -4255,13 +4255,13 @@
     },
     "2025": {
       "Bioenergy": 0.0769,
-      "Coal": 0.0593,
-      "Gas": 0.1081,
-      "Hydro": 0.064,
-      "Nuclear": 0.0836,
+      "Coal": 0.0598,
+      "Gas": 0.1076,
+      "Hydro": 0.0639,
+      "Nuclear": 0.0839,
       "Other Fossil": 0.2981,
       "Other Renewables": 0.0025,
-      "Solar": 0.0114,
+      "Solar": 0.0113,
       "Wind": 0.296
     }
   },
@@ -4274,74 +4274,74 @@
       "Nuclear": 0,
       "Other Fossil": 0.0682,
       "Other Renewables": 0,
-      "Solar": 0.0256,
-      "Wind": 0
+      "Solar": 0.0059,
+      "Wind": 0.0198
     },
     "2020": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.8477,
-      "Hydro": 0.0819,
+      "Gas": 0.8486,
+      "Hydro": 0.0762,
       "Nuclear": 0,
-      "Other Fossil": 0.0263,
+      "Other Fossil": 0.0264,
       "Other Renewables": 0,
-      "Solar": 0.0441,
-      "Wind": 0
+      "Solar": 0.0249,
+      "Wind": 0.024
     },
     "2021": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.8397,
-      "Hydro": 0.073,
+      "Gas": 0.8432,
+      "Hydro": 0.0662,
       "Nuclear": 0,
-      "Other Fossil": 0.0402,
+      "Other Fossil": 0.0403,
       "Other Renewables": 0,
-      "Solar": 0.0472,
-      "Wind": 0
+      "Solar": 0.0241,
+      "Wind": 0.0261
     },
     "2022": {
-      "Bioenergy": 0,
+      "Bioenergy": 0.0006,
       "Coal": 0,
-      "Gas": 0.7464,
-      "Hydro": 0.0713,
+      "Gas": 0.7442,
+      "Hydro": 0.0693,
       "Nuclear": 0,
-      "Other Fossil": 0.1352,
+      "Other Fossil": 0.1347,
       "Other Renewables": 0,
-      "Solar": 0.0471,
-      "Wind": 0
+      "Solar": 0.023,
+      "Wind": 0.0282
     },
     "2023": {
-      "Bioenergy": 0,
+      "Bioenergy": 0.0001,
       "Coal": 0,
-      "Gas": 0.779,
-      "Hydro": 0.0862,
+      "Gas": 0.7987,
+      "Hydro": 0.0676,
       "Nuclear": 0,
-      "Other Fossil": 0.0894,
+      "Other Fossil": 0.0848,
       "Other Renewables": 0,
-      "Solar": 0.0454,
-      "Wind": 0
+      "Solar": 0.0234,
+      "Wind": 0.0253
     },
     "2024": {
-      "Bioenergy": 0,
+      "Bioenergy": 0.0005,
       "Coal": 0,
-      "Gas": 0.7781,
-      "Hydro": 0.0948,
+      "Gas": 0.8137,
+      "Hydro": 0.0645,
       "Nuclear": 0,
-      "Other Fossil": 0.0819,
+      "Other Fossil": 0.0757,
       "Other Renewables": 0,
-      "Solar": 0.0452,
-      "Wind": 0
+      "Solar": 0.022,
+      "Wind": 0.0236
     },
     "2025": {
-      "Bioenergy": 0,
+      "Bioenergy": 0.0004,
       "Coal": 0,
-      "Gas": 0.7781,
-      "Hydro": 0.0948,
+      "Gas": 0.8237,
+      "Hydro": 0.0589,
       "Nuclear": 0,
-      "Other Fossil": 0.0819,
+      "Other Fossil": 0.0767,
       "Other Renewables": 0,
-      "Solar": 0.0452,
-      "Wind": 0
+      "Solar": 0.0194,
+      "Wind": 0.0209
     }
   },
   "ER": {
@@ -5113,7 +5113,7 @@
     },
     "2024": {
       "Bioenergy": 0.0736,
-      "Coal": 0.0222,
+      "Coal": 0.0223,
       "Gas": 0.2986,
       "Hydro": 0.0362,
       "Nuclear": 0.1679,
@@ -5124,8 +5124,8 @@
     },
     "2025": {
       "Bioenergy": 0.0658,
-      "Coal": 0.013,
-      "Gas": 0.4042,
+      "Coal": 0.0131,
+      "Gas": 0.4041,
       "Hydro": 0.0294,
       "Nuclear": 0.1328,
       "Other Fossil": 0.0169,
@@ -5217,19 +5217,19 @@
     "2019": {
       "Bioenergy": 0.0019,
       "Coal": 0.0717,
-      "Gas": 0.2287,
+      "Gas": 0.2286,
       "Hydro": 0.672,
       "Nuclear": 0.0065,
-      "Other Fossil": 0.0013,
+      "Other Fossil": 0.0012,
       "Other Renewables": 0.0007,
       "Solar": 0.0035,
       "Wind": 0.0138
     },
     "2020": {
       "Bioenergy": 0.002,
-      "Coal": 0.0662,
+      "Coal": 0.0661,
       "Gas": 0.2405,
-      "Hydro": 0.6653,
+      "Hydro": 0.6654,
       "Nuclear": 0.0059,
       "Other Fossil": 0.0011,
       "Other Renewables": 0.0005,
@@ -5238,11 +5238,11 @@
     },
     "2021": {
       "Bioenergy": 0.0028,
-      "Coal": 0.0824,
-      "Gas": 0.1829,
-      "Hydro": 0.7007,
+      "Coal": 0.0823,
+      "Gas": 0.1828,
+      "Hydro": 0.7008,
       "Nuclear": 0.0072,
-      "Other Fossil": 0.0014,
+      "Other Fossil": 0.0013,
       "Other Renewables": 0.0007,
       "Solar": 0.0055,
       "Wind": 0.0165
@@ -5250,8 +5250,8 @@
     "2022": {
       "Bioenergy": 0.0023,
       "Coal": 0.0598,
-      "Gas": 0.2366,
-      "Hydro": 0.675,
+      "Gas": 0.2365,
+      "Hydro": 0.6751,
       "Nuclear": 0.0056,
       "Other Fossil": 0.0011,
       "Other Renewables": 0.0005,
@@ -5261,7 +5261,7 @@
     "2023": {
       "Bioenergy": 0.0013,
       "Coal": 0.0338,
-      "Gas": 0.2491,
+      "Gas": 0.249,
       "Hydro": 0.6963,
       "Nuclear": 0.0032,
       "Other Fossil": 0.0005,
@@ -5272,24 +5272,24 @@
     "2024": {
       "Bioenergy": 0.0016,
       "Coal": 0.0406,
-      "Gas": 0.2034,
+      "Gas": 0.2033,
       "Hydro": 0.731,
       "Nuclear": 0.0039,
       "Other Fossil": 0.0004,
       "Other Renewables": 0.0004,
-      "Solar": 0.0052,
+      "Solar": 0.0053,
       "Wind": 0.0135
     },
     "2025": {
       "Bioenergy": 0.0035,
-      "Coal": 0.0883,
-      "Gas": 0.3688,
-      "Hydro": 0.4969,
+      "Coal": 0.0881,
+      "Gas": 0.3684,
+      "Hydro": 0.4971,
       "Nuclear": 0.0086,
       "Other Fossil": 0.0009,
       "Other Renewables": 0.0008,
-      "Solar": 0.011,
-      "Wind": 0.0212
+      "Solar": 0.0113,
+      "Wind": 0.0213
     }
   },
   "GF": {
@@ -6321,32 +6321,32 @@
   },
   "HK": {
     "2019": {
-      "Bioenergy": 0.0066,
+      "Bioenergy": 0.0067,
       "Coal": 0.5737,
-      "Gas": 0.3455,
-      "Hydro": 0.0347,
+      "Gas": 0.3454,
+      "Hydro": 0.0348,
       "Nuclear": 0.0134,
       "Other Fossil": 0.0063,
       "Other Renewables": 0.0014,
-      "Solar": 0.0081,
+      "Solar": 0.008,
       "Wind": 0.0103
     },
     "2020": {
-      "Bioenergy": 0.0071,
-      "Coal": 0.5713,
-      "Gas": 0.3447,
+      "Bioenergy": 0.0072,
+      "Coal": 0.5712,
+      "Gas": 0.3446,
       "Hydro": 0.0355,
       "Nuclear": 0.0134,
       "Other Fossil": 0.006,
       "Other Renewables": 0.0012,
-      "Solar": 0.0095,
+      "Solar": 0.0094,
       "Wind": 0.0114
     },
     "2021": {
-      "Bioenergy": 0.0076,
-      "Coal": 0.5707,
-      "Gas": 0.3431,
-      "Hydro": 0.0327,
+      "Bioenergy": 0.0077,
+      "Coal": 0.5706,
+      "Gas": 0.343,
+      "Hydro": 0.0328,
       "Nuclear": 0.0134,
       "Other Fossil": 0.0061,
       "Other Renewables": 0.0012,
@@ -6354,21 +6354,21 @@
       "Wind": 0.0143
     },
     "2022": {
-      "Bioenergy": 0.008,
+      "Bioenergy": 0.0081,
       "Coal": 0.5676,
       "Gas": 0.3417,
       "Hydro": 0.0328,
       "Nuclear": 0.0134,
-      "Other Fossil": 0.0061,
+      "Other Fossil": 0.0062,
       "Other Renewables": 0.0013,
-      "Solar": 0.0132,
+      "Solar": 0.0131,
       "Wind": 0.0159
     },
     "2023": {
-      "Bioenergy": 0.0081,
+      "Bioenergy": 0.0082,
       "Coal": 0.5686,
       "Gas": 0.3405,
-      "Hydro": 0.0292,
+      "Hydro": 0.0293,
       "Nuclear": 0.0134,
       "Other Fossil": 0.0055,
       "Other Renewables": 0.0013,
@@ -6376,10 +6376,10 @@
       "Wind": 0.0176
     },
     "2024": {
-      "Bioenergy": 0.0079,
-      "Coal": 0.5645,
+      "Bioenergy": 0.008,
+      "Coal": 0.5644,
       "Gas": 0.3396,
-      "Hydro": 0.0302,
+      "Hydro": 0.0303,
       "Nuclear": 0.0132,
       "Other Fossil": 0.0051,
       "Other Renewables": 0.0013,
@@ -6387,15 +6387,15 @@
       "Wind": 0.0183
     },
     "2025": {
-      "Bioenergy": 0.0085,
-      "Coal": 0.5698,
-      "Gas": 0.3398,
-      "Hydro": 0.0229,
-      "Nuclear": 0.0139,
+      "Bioenergy": 0.0086,
+      "Coal": 0.5695,
+      "Gas": 0.3392,
+      "Hydro": 0.0232,
+      "Nuclear": 0.014,
       "Other Fossil": 0.0052,
       "Other Renewables": 0.0013,
-      "Solar": 0.0182,
-      "Wind": 0.0204
+      "Solar": 0.0186,
+      "Wind": 0.0205
     }
   },
   "HN": {
@@ -6535,21 +6535,21 @@
     },
     "2024": {
       "Bioenergy": 0.04,
-      "Coal": 0.0744,
-      "Gas": 0.2146,
-      "Hydro": 0.3474,
-      "Nuclear": 0.0542,
-      "Other Fossil": 0.0097,
+      "Coal": 0.0745,
+      "Gas": 0.2145,
+      "Hydro": 0.3472,
+      "Nuclear": 0.0543,
+      "Other Fossil": 0.0098,
       "Other Renewables": 0.0163,
       "Solar": 0.0701,
       "Wind": 0.1734
     },
     "2025": {
       "Bioenergy": 0.0364,
-      "Coal": 0.0333,
-      "Gas": 0.2655,
+      "Coal": 0.0336,
+      "Gas": 0.2652,
       "Hydro": 0.3492,
-      "Nuclear": 0.0469,
+      "Nuclear": 0.0471,
       "Other Fossil": 0.0108,
       "Other Renewables": 0.0134,
       "Solar": 0.0124,
@@ -6693,24 +6693,24 @@
     },
     "2024": {
       "Bioenergy": 0.0264,
-      "Coal": 0.0878,
+      "Coal": 0.0879,
       "Gas": 0.1907,
-      "Hydro": 0.0455,
-      "Nuclear": 0.3703,
+      "Hydro": 0.0454,
+      "Nuclear": 0.3704,
       "Other Fossil": 0.0177,
       "Other Renewables": 0.004,
-      "Solar": 0.2128,
+      "Solar": 0.2127,
       "Wind": 0.0448
     },
     "2025": {
       "Bioenergy": 0.034,
-      "Coal": 0.0755,
-      "Gas": 0.2807,
+      "Coal": 0.0758,
+      "Gas": 0.2803,
       "Hydro": 0.0477,
-      "Nuclear": 0.3767,
+      "Nuclear": 0.3768,
       "Other Fossil": 0.0168,
       "Other Renewables": 0.0039,
-      "Solar": 0.1115,
+      "Solar": 0.1114,
       "Wind": 0.0533
     }
   },
@@ -6851,9 +6851,9 @@
     },
     "2024": {
       "Bioenergy": 0.0079,
-      "Coal": 0.0486,
+      "Coal": 0.0487,
       "Gas": 0.4406,
-      "Hydro": 0.0502,
+      "Hydro": 0.0501,
       "Nuclear": 0.0319,
       "Other Fossil": 0.0387,
       "Other Renewables": 0.001,
@@ -6862,10 +6862,10 @@
     },
     "2025": {
       "Bioenergy": 0.0068,
-      "Coal": 0.0352,
-      "Gas": 0.4044,
+      "Coal": 0.0354,
+      "Gas": 0.4042,
       "Hydro": 0.0492,
-      "Nuclear": 0.0275,
+      "Nuclear": 0.0276,
       "Other Fossil": 0.0341,
       "Other Renewables": 0.0008,
       "Solar": 0.01,
@@ -7325,7 +7325,7 @@
     },
     "2024": {
       "Bioenergy": 0.0555,
-      "Coal": 0.0351,
+      "Coal": 0.0352,
       "Gas": 0.4092,
       "Hydro": 0.1862,
       "Nuclear": 0.0346,
@@ -7336,14 +7336,14 @@
     },
     "2025": {
       "Bioenergy": 0.0541,
-      "Coal": 0.04,
-      "Gas": 0.506,
-      "Hydro": 0.1128,
-      "Nuclear": 0.0359,
+      "Coal": 0.0402,
+      "Gas": 0.5058,
+      "Hydro": 0.1127,
+      "Nuclear": 0.036,
       "Other Fossil": 0.0251,
       "Other Renewables": 0.0192,
-      "Solar": 0.072,
-      "Wind": 0.135
+      "Solar": 0.0719,
+      "Wind": 0.1349
     }
   },
   "JM": {
@@ -7561,26 +7561,26 @@
       "Wind": 0.0183
     },
     "2024": {
-      "Bioenergy": 0.0599,
-      "Coal": 0.2822,
-      "Gas": 0.304,
-      "Hydro": 0.0787,
-      "Nuclear": 0.0902,
-      "Other Fossil": 0.0337,
+      "Bioenergy": 0.0594,
+      "Coal": 0.2823,
+      "Gas": 0.3064,
+      "Hydro": 0.0769,
+      "Nuclear": 0.0898,
+      "Other Fossil": 0.0352,
       "Other Renewables": 0.0102,
-      "Solar": 0.1232,
-      "Wind": 0.018
+      "Solar": 0.121,
+      "Wind": 0.0187
     },
     "2025": {
-      "Bioenergy": 0.0702,
-      "Coal": 0.2957,
-      "Gas": 0.2925,
-      "Hydro": 0.0657,
-      "Nuclear": 0.0982,
-      "Other Fossil": 0.0335,
-      "Other Renewables": 0.0102,
-      "Solar": 0.1135,
-      "Wind": 0.0206
+      "Bioenergy": 0.0612,
+      "Coal": 0.3091,
+      "Gas": 0.3143,
+      "Hydro": 0.0471,
+      "Nuclear": 0.0935,
+      "Other Fossil": 0.05,
+      "Other Renewables": 0.0098,
+      "Solar": 0.0941,
+      "Wind": 0.0208
     }
   },
   "KE": {
@@ -7640,26 +7640,26 @@
       "Wind": 0.1517
     },
     "2024": {
-      "Bioenergy": 0.0104,
-      "Coal": 0.032,
-      "Gas": 0.0438,
-      "Hydro": 0.2734,
+      "Bioenergy": 0.0111,
+      "Coal": 0.0318,
+      "Gas": 0.0436,
+      "Hydro": 0.2751,
       "Nuclear": 0.0016,
       "Other Fossil": 0.0751,
-      "Other Renewables": 0.3978,
+      "Other Renewables": 0.3962,
       "Solar": 0.0341,
-      "Wind": 0.1319
+      "Wind": 0.1314
     },
     "2025": {
-      "Bioenergy": 0.0087,
-      "Coal": 0.0327,
-      "Gas": 0.0448,
-      "Hydro": 0.2425,
-      "Nuclear": 0.0016,
-      "Other Fossil": 0.0819,
-      "Other Renewables": 0.4173,
-      "Solar": 0.0347,
-      "Wind": 0.1357
+      "Bioenergy": 0.0174,
+      "Coal": 0.0307,
+      "Gas": 0.042,
+      "Hydro": 0.2623,
+      "Nuclear": 0.0015,
+      "Other Fossil": 0.0827,
+      "Other Renewables": 0.3989,
+      "Solar": 0.0351,
+      "Wind": 0.1294
     }
   },
   "KG": {
@@ -7697,7 +7697,7 @@
       "Wind": 0.0021
     },
     "2022": {
-      "Bioenergy": 0.0017,
+      "Bioenergy": 0.0018,
       "Coal": 0.1553,
       "Gas": 0.0167,
       "Hydro": 0.8089,
@@ -7708,10 +7708,10 @@
       "Wind": 0.0059
     },
     "2023": {
-      "Bioenergy": 0.0016,
-      "Coal": 0.1593,
+      "Bioenergy": 0.0017,
+      "Coal": 0.1592,
       "Gas": 0.0155,
-      "Hydro": 0.807,
+      "Hydro": 0.8071,
       "Nuclear": 0.004,
       "Other Fossil": 0.0029,
       "Other Renewables": 0.0004,
@@ -7721,7 +7721,7 @@
     "2024": {
       "Bioenergy": 0.0019,
       "Coal": 0.1307,
-      "Gas": 0.0169,
+      "Gas": 0.0168,
       "Hydro": 0.8151,
       "Nuclear": 0.0047,
       "Other Fossil": 0.017,
@@ -7731,21 +7731,21 @@
     },
     "2025": {
       "Bioenergy": 0.0017,
-      "Coal": 0.101,
-      "Gas": 0.0157,
-      "Hydro": 0.8402,
-      "Nuclear": 0.0041,
+      "Coal": 0.1009,
+      "Gas": 0.0155,
+      "Hydro": 0.8403,
+      "Nuclear": 0.0042,
       "Other Fossil": 0.0254,
       "Other Renewables": 0.0004,
-      "Solar": 0.0053,
+      "Solar": 0.0054,
       "Wind": 0.0061
     }
   },
   "KH": {
     "2019": {
-      "Bioenergy": 0.0121,
-      "Coal": 0.4726,
-      "Gas": 0.0306,
+      "Bioenergy": 0.0122,
+      "Coal": 0.4725,
+      "Gas": 0.0305,
       "Hydro": 0.3854,
       "Nuclear": 0.0135,
       "Other Fossil": 0.0563,
@@ -7757,7 +7757,7 @@
       "Bioenergy": 0.0126,
       "Coal": 0.4701,
       "Gas": 0.0298,
-      "Hydro": 0.3861,
+      "Hydro": 0.3862,
       "Nuclear": 0.0135,
       "Other Fossil": 0.0561,
       "Other Renewables": 0.0012,
@@ -7766,7 +7766,7 @@
     },
     "2021": {
       "Bioenergy": 0.0131,
-      "Coal": 0.4695,
+      "Coal": 0.4694,
       "Gas": 0.0282,
       "Hydro": 0.3834,
       "Nuclear": 0.0135,
@@ -7776,7 +7776,7 @@
       "Wind": 0.0144
     },
     "2022": {
-      "Bioenergy": 0.0135,
+      "Bioenergy": 0.0136,
       "Coal": 0.4664,
       "Gas": 0.0268,
       "Hydro": 0.3834,
@@ -7787,21 +7787,21 @@
       "Wind": 0.016
     },
     "2023": {
-      "Bioenergy": 0.0136,
-      "Coal": 0.4675,
-      "Gas": 0.0256,
+      "Bioenergy": 0.0137,
+      "Coal": 0.4674,
+      "Gas": 0.0255,
       "Hydro": 0.3799,
       "Nuclear": 0.0135,
-      "Other Fossil": 0.0555,
+      "Other Fossil": 0.0556,
       "Other Renewables": 0.0013,
       "Solar": 0.0254,
       "Wind": 0.0177
     },
     "2024": {
-      "Bioenergy": 0.0134,
-      "Coal": 0.4633,
+      "Bioenergy": 0.0135,
+      "Coal": 0.4632,
       "Gas": 0.0247,
-      "Hydro": 0.3808,
+      "Hydro": 0.3809,
       "Nuclear": 0.0133,
       "Other Fossil": 0.0552,
       "Other Renewables": 0.0013,
@@ -7809,15 +7809,15 @@
       "Wind": 0.0184
     },
     "2025": {
-      "Bioenergy": 0.014,
-      "Coal": 0.4686,
-      "Gas": 0.0249,
-      "Hydro": 0.3735,
-      "Nuclear": 0.014,
+      "Bioenergy": 0.0141,
+      "Coal": 0.4683,
+      "Gas": 0.0243,
+      "Hydro": 0.3738,
+      "Nuclear": 0.0141,
       "Other Fossil": 0.0552,
       "Other Renewables": 0.0013,
-      "Solar": 0.0279,
-      "Wind": 0.0205
+      "Solar": 0.0283,
+      "Wind": 0.0206
     }
   },
   "KI": {
@@ -8193,26 +8193,26 @@
       "Wind": 0.0058
     },
     "2024": {
-      "Bioenergy": 0.0213,
-      "Coal": 0.2815,
-      "Gas": 0.2834,
-      "Hydro": 0.0074,
-      "Nuclear": 0.323,
-      "Other Fossil": 0.008,
-      "Other Renewables": 0.0139,
-      "Solar": 0.0563,
-      "Wind": 0.0054
+      "Bioenergy": 0.0212,
+      "Coal": 0.284,
+      "Gas": 0.284,
+      "Hydro": 0.0073,
+      "Nuclear": 0.3205,
+      "Other Fossil": 0.0079,
+      "Other Renewables": 0.0138,
+      "Solar": 0.0556,
+      "Wind": 0.0057
     },
     "2025": {
-      "Bioenergy": 0.0214,
-      "Coal": 0.2541,
-      "Gas": 0.2855,
-      "Hydro": 0.0044,
-      "Nuclear": 0.3564,
-      "Other Fossil": 0.0086,
-      "Other Renewables": 0.0152,
-      "Solar": 0.0477,
-      "Wind": 0.0066
+      "Bioenergy": 0.0209,
+      "Coal": 0.286,
+      "Gas": 0.2914,
+      "Hydro": 0.0041,
+      "Nuclear": 0.324,
+      "Other Fossil": 0.0083,
+      "Other Renewables": 0.0145,
+      "Solar": 0.0407,
+      "Wind": 0.0101
     }
   },
   "KW": {
@@ -8431,25 +8431,25 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Coal": 0.5494,
-      "Gas": 0.2773,
-      "Hydro": 0.0978,
+      "Coal": 0.5505,
+      "Gas": 0.2779,
+      "Hydro": 0.0965,
       "Nuclear": 0,
-      "Other Fossil": 0.0204,
+      "Other Fossil": 0.0205,
       "Other Renewables": 0,
-      "Solar": 0.0167,
-      "Wind": 0.0383
+      "Solar": 0.0172,
+      "Wind": 0.0373
     },
     "2025": {
       "Bioenergy": 0,
-      "Coal": 0.5499,
-      "Gas": 0.2779,
-      "Hydro": 0.0988,
+      "Coal": 0.5617,
+      "Gas": 0.2835,
+      "Hydro": 0.085,
       "Nuclear": 0,
-      "Other Fossil": 0.0205,
+      "Other Fossil": 0.0215,
       "Other Renewables": 0,
-      "Solar": 0.0088,
-      "Wind": 0.044
+      "Solar": 0.0152,
+      "Wind": 0.0331
     }
   },
   "LA": {
@@ -8984,10 +8984,10 @@
     },
     "2024": {
       "Bioenergy": 0.0307,
-      "Coal": 0.0607,
+      "Coal": 0.0609,
       "Gas": 0.1656,
-      "Hydro": 0.1101,
-      "Nuclear": 0.0911,
+      "Hydro": 0.1099,
+      "Nuclear": 0.0913,
       "Other Fossil": 0.0841,
       "Other Renewables": 0.0029,
       "Solar": 0.1399,
@@ -8995,13 +8995,13 @@
     },
     "2025": {
       "Bioenergy": 0.0256,
-      "Coal": 0.0489,
-      "Gas": 0.253,
-      "Hydro": 0.0773,
-      "Nuclear": 0.0689,
+      "Coal": 0.0493,
+      "Gas": 0.2526,
+      "Hydro": 0.0772,
+      "Nuclear": 0.0691,
       "Other Fossil": 0.0973,
       "Other Renewables": 0.002,
-      "Solar": 0.0258,
+      "Solar": 0.0257,
       "Wind": 0.4012
     }
   },
@@ -9063,10 +9063,10 @@
     },
     "2024": {
       "Bioenergy": 0.0735,
-      "Coal": 0.0981,
-      "Gas": 0.1811,
-      "Hydro": 0.1563,
-      "Nuclear": 0.1477,
+      "Coal": 0.0985,
+      "Gas": 0.181,
+      "Hydro": 0.1559,
+      "Nuclear": 0.1479,
       "Other Fossil": 0.0371,
       "Other Renewables": 0.0047,
       "Solar": 0.1156,
@@ -9074,10 +9074,10 @@
     },
     "2025": {
       "Bioenergy": 0.0842,
-      "Coal": 0.1083,
-      "Gas": 0.2187,
-      "Hydro": 0.1382,
-      "Nuclear": 0.1527,
+      "Coal": 0.1092,
+      "Gas": 0.2177,
+      "Hydro": 0.138,
+      "Nuclear": 0.1531,
       "Other Fossil": 0.037,
       "Other Renewables": 0.0045,
       "Solar": 0.042,
@@ -9142,10 +9142,10 @@
     },
     "2024": {
       "Bioenergy": 0.0459,
-      "Coal": 0.0393,
+      "Coal": 0.0395,
       "Gas": 0.2678,
-      "Hydro": 0.4256,
-      "Nuclear": 0.059,
+      "Hydro": 0.4253,
+      "Nuclear": 0.0591,
       "Other Fossil": 0.0161,
       "Other Renewables": 0.0019,
       "Solar": 0.0779,
@@ -9153,10 +9153,10 @@
     },
     "2025": {
       "Bioenergy": 0.0335,
-      "Coal": 0.0092,
-      "Gas": 0.3343,
-      "Hydro": 0.5338,
-      "Nuclear": 0.013,
+      "Coal": 0.0093,
+      "Gas": 0.3342,
+      "Hydro": 0.5337,
+      "Nuclear": 0.0131,
       "Other Fossil": 0.0172,
       "Other Renewables": 0.0004,
       "Solar": 0.0018,
@@ -9390,7 +9390,7 @@
     },
     "2025": {
       "Bioenergy": 0.0006,
-      "Coal": 0.003,
+      "Coal": 0.0031,
       "Gas": 0.9222,
       "Hydro": 0.045,
       "Nuclear": 0.0043,
@@ -9458,10 +9458,10 @@
     },
     "2024": {
       "Bioenergy": 0.0039,
-      "Coal": 0.3767,
+      "Coal": 0.3768,
       "Gas": 0.0311,
-      "Hydro": 0.4324,
-      "Nuclear": 0.0288,
+      "Hydro": 0.4323,
+      "Nuclear": 0.0289,
       "Other Fossil": 0.0029,
       "Other Renewables": 0.0009,
       "Solar": 0.0316,
@@ -9469,10 +9469,10 @@
     },
     "2025": {
       "Bioenergy": 0.0038,
-      "Coal": 0.4091,
-      "Gas": 0.0368,
-      "Hydro": 0.4107,
-      "Nuclear": 0.0285,
+      "Coal": 0.4092,
+      "Gas": 0.0366,
+      "Hydro": 0.4106,
+      "Nuclear": 0.0286,
       "Other Fossil": 0.0029,
       "Other Renewables": 0.0008,
       "Solar": 0.0039,
@@ -9616,9 +9616,9 @@
     },
     "2024": {
       "Bioenergy": 0.0177,
-      "Coal": 0.4007,
-      "Gas": 0.2387,
-      "Hydro": 0.2353,
+      "Coal": 0.4008,
+      "Gas": 0.2386,
+      "Hydro": 0.2352,
       "Nuclear": 0.0154,
       "Other Fossil": 0.0015,
       "Other Renewables": 0.0005,
@@ -9627,10 +9627,10 @@
     },
     "2025": {
       "Bioenergy": 0.0182,
-      "Coal": 0.3952,
-      "Gas": 0.2989,
+      "Coal": 0.3954,
+      "Gas": 0.2986,
       "Hydro": 0.1605,
-      "Nuclear": 0.0378,
+      "Nuclear": 0.0379,
       "Other Fossil": 0.0039,
       "Other Renewables": 0.0011,
       "Solar": 0.0315,
@@ -9864,77 +9864,77 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Coal": 0.9231,
+      "Coal": 0.9222,
       "Gas": 0,
       "Hydro": 0,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
       "Solar": 0,
-      "Wind": 0.0769
+      "Wind": 0.0778
     }
   },
   "MO": {
     "2019": {
-      "Bioenergy": 0.0507,
-      "Coal": 0.5002,
-      "Gas": 0.1808,
-      "Hydro": 0.1184,
+      "Bioenergy": 0.051,
+      "Coal": 0.5,
+      "Gas": 0.1807,
+      "Hydro": 0.1185,
       "Nuclear": 0.0457,
       "Other Fossil": 0.0381,
       "Other Renewables": 0.0048,
-      "Solar": 0.0262,
-      "Wind": 0.0352
+      "Solar": 0.0261,
+      "Wind": 0.0351
     },
     "2020": {
-      "Bioenergy": 0.0523,
-      "Coal": 0.4919,
-      "Gas": 0.1781,
-      "Hydro": 0.1209,
+      "Bioenergy": 0.0525,
+      "Coal": 0.4916,
+      "Gas": 0.178,
+      "Hydro": 0.1211,
       "Nuclear": 0.0457,
       "Other Fossil": 0.0371,
       "Other Renewables": 0.0041,
-      "Solar": 0.031,
+      "Solar": 0.0309,
       "Wind": 0.0389
     },
     "2021": {
-      "Bioenergy": 0.054,
-      "Coal": 0.4897,
-      "Gas": 0.1727,
-      "Hydro": 0.1116,
+      "Bioenergy": 0.0542,
+      "Coal": 0.4895,
+      "Gas": 0.1726,
+      "Hydro": 0.1118,
       "Nuclear": 0.0457,
       "Other Fossil": 0.0375,
-      "Other Renewables": 0.0042,
-      "Solar": 0.0357,
+      "Other Renewables": 0.0043,
+      "Solar": 0.0356,
       "Wind": 0.0488
     },
     "2022": {
-      "Bioenergy": 0.0555,
-      "Coal": 0.4793,
-      "Gas": 0.1681,
-      "Hydro": 0.1117,
+      "Bioenergy": 0.0557,
+      "Coal": 0.4792,
+      "Gas": 0.168,
+      "Hydro": 0.1118,
       "Nuclear": 0.0455,
-      "Other Fossil": 0.0376,
+      "Other Fossil": 0.0377,
       "Other Renewables": 0.0044,
-      "Solar": 0.0436,
+      "Solar": 0.0435,
       "Wind": 0.0542
     },
     "2023": {
-      "Bioenergy": 0.0558,
-      "Coal": 0.4829,
-      "Gas": 0.1638,
-      "Hydro": 0.0997,
+      "Bioenergy": 0.0561,
+      "Coal": 0.4827,
+      "Gas": 0.1637,
+      "Hydro": 0.0998,
       "Nuclear": 0.0456,
       "Other Fossil": 0.0354,
       "Other Renewables": 0.0044,
-      "Solar": 0.0523,
+      "Solar": 0.0522,
       "Wind": 0.06
     },
     "2024": {
-      "Bioenergy": 0.0552,
-      "Coal": 0.4686,
-      "Gas": 0.161,
-      "Hydro": 0.103,
+      "Bioenergy": 0.0554,
+      "Coal": 0.4684,
+      "Gas": 0.1607,
+      "Hydro": 0.1031,
       "Nuclear": 0.0449,
       "Other Fossil": 0.0342,
       "Other Renewables": 0.0045,
@@ -9942,15 +9942,15 @@
       "Wind": 0.0624
     },
     "2025": {
-      "Bioenergy": 0.0571,
-      "Coal": 0.4867,
-      "Gas": 0.1616,
-      "Hydro": 0.0782,
-      "Nuclear": 0.0473,
+      "Bioenergy": 0.0573,
+      "Coal": 0.4858,
+      "Gas": 0.1596,
+      "Hydro": 0.0791,
+      "Nuclear": 0.0477,
       "Other Fossil": 0.0343,
       "Other Renewables": 0.0044,
-      "Solar": 0.0609,
-      "Wind": 0.0695
+      "Solar": 0.0621,
+      "Wind": 0.0697
     }
   },
   "MQ": {
@@ -10249,9 +10249,9 @@
     "2024": {
       "Bioenergy": 0.0062,
       "Coal": 0.0295,
-      "Gas": 0.7049,
-      "Hydro": 0.0401,
-      "Nuclear": 0.0451,
+      "Gas": 0.7048,
+      "Hydro": 0.04,
+      "Nuclear": 0.0452,
       "Other Fossil": 0.0068,
       "Other Renewables": 0.0014,
       "Solar": 0.1386,
@@ -10259,10 +10259,10 @@
     },
     "2025": {
       "Bioenergy": 0.005,
-      "Coal": 0.0264,
-      "Gas": 0.7755,
+      "Coal": 0.0267,
+      "Gas": 0.7752,
       "Hydro": 0.0285,
-      "Nuclear": 0.0373,
+      "Nuclear": 0.0374,
       "Other Fossil": 0.0038,
       "Other Renewables": 0.0011,
       "Solar": 0.096,
@@ -10574,93 +10574,93 @@
       "Wind": 0.0568
     },
     "2025": {
-      "Bioenergy": 0.0008,
-      "Coal": 0.0438,
-      "Gas": 0.6054,
-      "Hydro": 0.0542,
-      "Nuclear": 0.0454,
-      "Other Fossil": 0.1144,
-      "Other Renewables": 0.0116,
-      "Solar": 0.0502,
-      "Wind": 0.0741
+      "Bioenergy": 0.0004,
+      "Coal": 0.047,
+      "Gas": 0.611,
+      "Hydro": 0.0497,
+      "Nuclear": 0.0428,
+      "Other Fossil": 0.1114,
+      "Other Renewables": 0.012,
+      "Solar": 0.047,
+      "Wind": 0.0786
     }
   },
   "MY": {
     "2019": {
-      "Bioenergy": 0.0064,
-      "Coal": 0.4281,
-      "Gas": 0.4049,
-      "Hydro": 0.1468,
+      "Bioenergy": 0.0249,
+      "Coal": 0.428,
+      "Gas": 0.3843,
+      "Hydro": 0.1549,
       "Nuclear": 0,
-      "Other Fossil": 0.0057,
+      "Other Fossil": 0.0041,
       "Other Renewables": 0,
-      "Solar": 0.0082,
+      "Solar": 0.0037,
       "Wind": 0
     },
     "2020": {
-      "Bioenergy": 0.0064,
-      "Coal": 0.4281,
-      "Gas": 0.4049,
-      "Hydro": 0.1468,
+      "Bioenergy": 0.0213,
+      "Coal": 0.5043,
+      "Gas": 0.2946,
+      "Hydro": 0.1711,
       "Nuclear": 0,
-      "Other Fossil": 0.0057,
+      "Other Fossil": 0.0033,
       "Other Renewables": 0,
-      "Solar": 0.0082,
+      "Solar": 0.0053,
       "Wind": 0
     },
     "2021": {
-      "Bioenergy": 0.0064,
-      "Coal": 0.4281,
-      "Gas": 0.4049,
-      "Hydro": 0.1468,
+      "Bioenergy": 0.0239,
+      "Coal": 0.4533,
+      "Gas": 0.3265,
+      "Hydro": 0.1849,
       "Nuclear": 0,
-      "Other Fossil": 0.0057,
+      "Other Fossil": 0.0046,
       "Other Renewables": 0,
-      "Solar": 0.0082,
+      "Solar": 0.0067,
       "Wind": 0
     },
     "2022": {
-      "Bioenergy": 0.0064,
-      "Coal": 0.4281,
-      "Gas": 0.4049,
-      "Hydro": 0.1468,
+      "Bioenergy": 0.0251,
+      "Coal": 0.4226,
+      "Gas": 0.3473,
+      "Hydro": 0.1869,
       "Nuclear": 0,
-      "Other Fossil": 0.0057,
+      "Other Fossil": 0.0086,
       "Other Renewables": 0,
-      "Solar": 0.0082,
+      "Solar": 0.0095,
       "Wind": 0
     },
     "2023": {
-      "Bioenergy": 0.0064,
-      "Coal": 0.4281,
-      "Gas": 0.4049,
-      "Hydro": 0.1468,
+      "Bioenergy": 0.0247,
+      "Coal": 0.4356,
+      "Gas": 0.3413,
+      "Hydro": 0.1815,
       "Nuclear": 0,
-      "Other Fossil": 0.0057,
+      "Other Fossil": 0.0047,
       "Other Renewables": 0,
-      "Solar": 0.0082,
+      "Solar": 0.0121,
       "Wind": 0
     },
     "2024": {
-      "Bioenergy": 0.0064,
-      "Coal": 0.4281,
-      "Gas": 0.4049,
-      "Hydro": 0.1468,
+      "Bioenergy": 0.0236,
+      "Coal": 0.4382,
+      "Gas": 0.343,
+      "Hydro": 0.1745,
       "Nuclear": 0,
-      "Other Fossil": 0.0057,
+      "Other Fossil": 0.0042,
       "Other Renewables": 0,
-      "Solar": 0.0082,
+      "Solar": 0.0164,
       "Wind": 0
     },
     "2025": {
-      "Bioenergy": 0.0064,
-      "Coal": 0.4281,
-      "Gas": 0.4049,
-      "Hydro": 0.1468,
+      "Bioenergy": 0.0237,
+      "Coal": 0.432,
+      "Gas": 0.3284,
+      "Hydro": 0.195,
       "Nuclear": 0,
-      "Other Fossil": 0.0057,
+      "Other Fossil": 0.0041,
       "Other Renewables": 0,
-      "Solar": 0.0082,
+      "Solar": 0.0169,
       "Wind": 0
     }
   },
@@ -11119,9 +11119,9 @@
       "Bioenergy": 0.1685,
       "Coal": 0.0032,
       "Gas": 0.0212,
-      "Hydro": 0.0842,
+      "Hydro": 0.0843,
       "Nuclear": 0.0019,
-      "Other Fossil": 0.3985,
+      "Other Fossil": 0.3984,
       "Other Renewables": 0.1562,
       "Solar": 0.0123,
       "Wind": 0.1541
@@ -11129,10 +11129,10 @@
     "2025": {
       "Bioenergy": 0.1683,
       "Coal": 0.0028,
-      "Gas": 0.019,
+      "Gas": 0.0191,
       "Hydro": 0.0856,
       "Nuclear": 0.0016,
-      "Other Fossil": 0.398,
+      "Other Fossil": 0.3979,
       "Other Renewables": 0.1562,
       "Solar": 0.0137,
       "Wind": 0.1549
@@ -11298,8 +11298,8 @@
   },
   "NP": {
     "2019": {
-      "Bioenergy": 0.0031,
-      "Coal": 0.1219,
+      "Bioenergy": 0.0032,
+      "Coal": 0.1218,
       "Gas": 0.0252,
       "Hydro": 0.8088,
       "Nuclear": 0.0111,
@@ -11309,9 +11309,9 @@
       "Wind": 0.0098
     },
     "2020": {
-      "Bioenergy": 0.0035,
+      "Bioenergy": 0.0036,
       "Coal": 0.1198,
-      "Gas": 0.0246,
+      "Gas": 0.0245,
       "Hydro": 0.8094,
       "Nuclear": 0.0111,
       "Other Fossil": 0.0019,
@@ -11323,7 +11323,7 @@
       "Bioenergy": 0.004,
       "Coal": 0.1193,
       "Gas": 0.0232,
-      "Hydro": 0.8071,
+      "Hydro": 0.8072,
       "Nuclear": 0.0111,
       "Other Fossil": 0.002,
       "Other Renewables": 0.001,
@@ -11331,7 +11331,7 @@
       "Wind": 0.0132
     },
     "2022": {
-      "Bioenergy": 0.0043,
+      "Bioenergy": 0.0044,
       "Coal": 0.1168,
       "Gas": 0.0221,
       "Hydro": 0.8072,
@@ -11342,10 +11342,10 @@
       "Wind": 0.0145
     },
     "2023": {
-      "Bioenergy": 0.0044,
-      "Coal": 0.1177,
+      "Bioenergy": 0.0045,
+      "Coal": 0.1176,
       "Gas": 0.0211,
-      "Hydro": 0.8042,
+      "Hydro": 0.8043,
       "Nuclear": 0.0111,
       "Other Fossil": 0.0015,
       "Other Renewables": 0.0011,
@@ -11353,10 +11353,10 @@
       "Wind": 0.0159
     },
     "2024": {
-      "Bioenergy": 0.0042,
-      "Coal": 0.1142,
-      "Gas": 0.0204,
-      "Hydro": 0.805,
+      "Bioenergy": 0.0043,
+      "Coal": 0.1141,
+      "Gas": 0.0203,
+      "Hydro": 0.8051,
       "Nuclear": 0.0109,
       "Other Fossil": 0.0012,
       "Other Renewables": 0.0011,
@@ -11364,15 +11364,15 @@
       "Wind": 0.0165
     },
     "2025": {
-      "Bioenergy": 0.0047,
-      "Coal": 0.1186,
-      "Gas": 0.0205,
-      "Hydro": 0.799,
-      "Nuclear": 0.0115,
-      "Other Fossil": 0.0013,
+      "Bioenergy": 0.0048,
+      "Coal": 0.1184,
+      "Gas": 0.0201,
+      "Hydro": 0.7992,
+      "Nuclear": 0.0116,
+      "Other Fossil": 0.0012,
       "Other Renewables": 0.0011,
-      "Solar": 0.0251,
-      "Wind": 0.0182
+      "Solar": 0.0254,
+      "Wind": 0.0183
     }
   },
   "NR": {
@@ -11601,15 +11601,15 @@
       "Wind": 0.0917
     },
     "2025": {
-      "Bioenergy": 0.0062,
-      "Coal": 0.0093,
-      "Gas": 0.0187,
-      "Hydro": 0.6231,
+      "Bioenergy": 0.0032,
+      "Coal": 0.0194,
+      "Gas": 0.0777,
+      "Hydro": 0.589,
       "Nuclear": 0,
       "Other Fossil": 0,
-      "Other Renewables": 0.2305,
+      "Other Renewables": 0.2395,
       "Solar": 0,
-      "Wind": 0.1121
+      "Wind": 0.0712
     }
   },
   "OM": {
@@ -11840,13 +11840,13 @@
     "2025": {
       "Bioenergy": 0.0077,
       "Coal": 0,
-      "Gas": 0.264,
-      "Hydro": 0.6281,
+      "Gas": 0.2495,
+      "Hydro": 0.6557,
       "Nuclear": 0,
       "Other Fossil": 0.0019,
       "Other Renewables": 0,
-      "Solar": 0.027,
-      "Wind": 0.0713
+      "Solar": 0.0232,
+      "Wind": 0.0619
     }
   },
   "PF": {
@@ -12381,25 +12381,25 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Coal": 0.1747,
-      "Gas": 0.3903,
+      "Coal": 0.1766,
+      "Gas": 0.4064,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": 0.4142,
+      "Other Fossil": 0.3958,
       "Other Renewables": 0,
-      "Solar": 0.0116,
-      "Wind": 0.0092
+      "Solar": 0.0119,
+      "Wind": 0.0094
     },
     "2025": {
       "Bioenergy": 0,
-      "Coal": 0.1622,
-      "Gas": 0.3986,
+      "Coal": 0.1719,
+      "Gas": 0.5,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": 0.4257,
+      "Other Fossil": 0.3125,
       "Other Renewables": 0,
-      "Solar": 0.0068,
-      "Wind": 0.0068
+      "Solar": 0.0078,
+      "Wind": 0.0078
     }
   },
   "PS": {
@@ -12539,10 +12539,10 @@
     },
     "2024": {
       "Bioenergy": 0.0664,
-      "Coal": 0.0288,
+      "Coal": 0.0289,
       "Gas": 0.1455,
-      "Hydro": 0.2732,
-      "Nuclear": 0.0444,
+      "Hydro": 0.2731,
+      "Nuclear": 0.0445,
       "Other Fossil": 0.0092,
       "Other Renewables": 0.0014,
       "Solar": 0.1288,
@@ -12550,9 +12550,9 @@
     },
     "2025": {
       "Bioenergy": 0.0549,
-      "Coal": 0.0163,
-      "Gas": 0.1708,
-      "Hydro": 0.277,
+      "Coal": 0.0164,
+      "Gas": 0.1707,
+      "Hydro": 0.2769,
       "Nuclear": 0.023,
       "Other Fossil": 0.0065,
       "Other Renewables": 0.0007,
@@ -12855,10 +12855,10 @@
     },
     "2024": {
       "Bioenergy": 0.0096,
-      "Coal": 0.1312,
+      "Coal": 0.1313,
       "Gas": 0.1951,
-      "Hydro": 0.2619,
-      "Nuclear": 0.2035,
+      "Hydro": 0.2618,
+      "Nuclear": 0.2036,
       "Other Fossil": 0.0014,
       "Other Renewables": 0.0004,
       "Solar": 0.078,
@@ -12866,8 +12866,8 @@
     },
     "2025": {
       "Bioenergy": 0.0116,
-      "Coal": 0.1435,
-      "Gas": 0.2776,
+      "Coal": 0.1436,
+      "Gas": 0.2774,
       "Hydro": 0.1997,
       "Nuclear": 0.2221,
       "Other Fossil": 0.0024,
@@ -12934,8 +12934,8 @@
     },
     "2024": {
       "Bioenergy": 0.0086,
-      "Coal": 0.6057,
-      "Gas": 0.0332,
+      "Coal": 0.6058,
+      "Gas": 0.0331,
       "Hydro": 0.2896,
       "Nuclear": 0.0114,
       "Other Fossil": 0.008,
@@ -12946,7 +12946,7 @@
     "2025": {
       "Bioenergy": 0.0063,
       "Coal": 0.615,
-      "Gas": 0.0772,
+      "Gas": 0.0771,
       "Hydro": 0.2561,
       "Nuclear": 0.0041,
       "Other Fossil": 0.0062,
@@ -13013,25 +13013,25 @@
     },
     "2024": {
       "Bioenergy": 0.0007,
-      "Coal": 0.1745,
-      "Gas": 0.4426,
-      "Hydro": 0.1803,
-      "Nuclear": 0.1847,
-      "Other Fossil": 0.0105,
+      "Coal": 0.176,
+      "Gas": 0.4462,
+      "Hydro": 0.1756,
+      "Nuclear": 0.1845,
+      "Other Fossil": 0.0106,
       "Other Renewables": 0,
-      "Solar": 0.0023,
-      "Wind": 0.0045
+      "Solar": 0.002,
+      "Wind": 0.0044
     },
     "2025": {
       "Bioenergy": 0.0007,
-      "Coal": 0.1841,
-      "Gas": 0.4427,
-      "Hydro": 0.1648,
-      "Nuclear": 0.1907,
-      "Other Fossil": 0.0106,
+      "Coal": 0.1919,
+      "Gas": 0.4644,
+      "Hydro": 0.1343,
+      "Nuclear": 0.1935,
+      "Other Fossil": 0.0111,
       "Other Renewables": 0,
-      "Solar": 0.0022,
-      "Wind": 0.0041
+      "Solar": 0.0004,
+      "Wind": 0.0038
     }
   },
   "RW": {
@@ -13567,23 +13567,23 @@
     "2024": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.9559,
+      "Gas": 0.9563,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": 0.0222,
+      "Other Fossil": 0.0225,
       "Other Renewables": 0,
-      "Solar": 0.0219,
+      "Solar": 0.0211,
       "Wind": 0
     },
     "2025": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.9552,
+      "Gas": 0.9609,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": 0.0214,
+      "Other Fossil": 0.0206,
       "Other Renewables": 0,
-      "Solar": 0.0234,
+      "Solar": 0.0185,
       "Wind": 0
     }
   },
@@ -14775,13 +14775,13 @@
   "TH": {
     "2019": {
       "Bioenergy": 0.0616,
-      "Coal": 0.2345,
+      "Coal": 0.2344,
       "Gas": 0.5955,
       "Hydro": 0.0456,
       "Nuclear": 0.0058,
       "Other Fossil": 0.0064,
       "Other Renewables": 0.0006,
-      "Solar": 0.0283,
+      "Solar": 0.0282,
       "Wind": 0.0218
     },
     "2020": {
@@ -14797,7 +14797,7 @@
     },
     "2021": {
       "Bioenergy": 0.067,
-      "Coal": 0.2594,
+      "Coal": 0.2593,
       "Gas": 0.5611,
       "Hydro": 0.0427,
       "Nuclear": 0.0081,
@@ -14807,10 +14807,10 @@
       "Wind": 0.0291
     },
     "2022": {
-      "Bioenergy": 0.068,
+      "Bioenergy": 0.0681,
       "Coal": 0.253,
       "Gas": 0.5526,
-      "Hydro": 0.0522,
+      "Hydro": 0.0523,
       "Nuclear": 0.0082,
       "Other Fossil": 0.0096,
       "Other Renewables": 0.0008,
@@ -14820,7 +14820,7 @@
     "2023": {
       "Bioenergy": 0.0675,
       "Coal": 0.2154,
-      "Gas": 0.5993,
+      "Gas": 0.5992,
       "Hydro": 0.0466,
       "Nuclear": 0.0074,
       "Other Fossil": 0.0051,
@@ -14841,13 +14841,13 @@
     },
     "2025": {
       "Bioenergy": 0.0558,
-      "Coal": 0.2436,
-      "Gas": 0.5902,
-      "Hydro": 0.036,
-      "Nuclear": 0.0077,
-      "Other Fossil": 0.0014,
+      "Coal": 0.2434,
+      "Gas": 0.5899,
+      "Hydro": 0.0362,
+      "Nuclear": 0.0078,
+      "Other Fossil": 0.0013,
       "Other Renewables": 0.0007,
-      "Solar": 0.0349,
+      "Solar": 0.0351,
       "Wind": 0.0296
     }
   },
@@ -15789,14 +15789,14 @@
     },
     "2025": {
       "Bioenergy": 0.0099,
-      "Coal": 0.2049,
+      "Coal": 0.2047,
       "Gas": 0.3865,
       "Hydro": 0.0536,
-      "Nuclear": 0.1777,
-      "Other Fossil": 0.0082,
+      "Nuclear": 0.1776,
+      "Other Fossil": 0.0083,
       "Other Renewables": 0.0035,
-      "Solar": 0.0503,
-      "Wind": 0.1054
+      "Solar": 0.0507,
+      "Wind": 0.1053
     }
   },
   "UY": {
@@ -15869,10 +15869,10 @@
     "2025": {
       "Bioenergy": 0.1551,
       "Coal": 0.0024,
-      "Gas": 0.0434,
+      "Gas": 0.0435,
       "Hydro": 0.3973,
       "Nuclear": 0.0013,
-      "Other Fossil": 0.0131,
+      "Other Fossil": 0.013,
       "Other Renewables": 0.0004,
       "Solar": 0.0519,
       "Wind": 0.335
@@ -15904,7 +15904,7 @@
     "2021": {
       "Bioenergy": 0.0004,
       "Coal": 0.0704,
-      "Gas": 0.8125,
+      "Gas": 0.8124,
       "Hydro": 0.1022,
       "Nuclear": 0.0011,
       "Other Fossil": 0.0112,
@@ -15948,12 +15948,12 @@
     "2025": {
       "Bioenergy": 0.0005,
       "Coal": 0.0704,
-      "Gas": 0.8122,
+      "Gas": 0.8121,
       "Hydro": 0.1014,
       "Nuclear": 0.0011,
       "Other Fossil": 0.0111,
       "Other Renewables": 0.0001,
-      "Solar": 0.0016,
+      "Solar": 0.0017,
       "Wind": 0.0016
     }
   },
@@ -16568,10 +16568,10 @@
     },
     "2024": {
       "Bioenergy": 0.0028,
-      "Coal": 0.8393,
-      "Gas": 0.0253,
-      "Hydro": 0.045,
-      "Nuclear": 0.0206,
+      "Coal": 0.8394,
+      "Gas": 0.0252,
+      "Hydro": 0.0448,
+      "Nuclear": 0.0207,
       "Other Fossil": 0.0021,
       "Other Renewables": 0.0006,
       "Solar": 0.0046,
@@ -16579,10 +16579,10 @@
     },
     "2025": {
       "Bioenergy": 0.0059,
-      "Coal": 0.7747,
-      "Gas": 0.0573,
+      "Coal": 0.775,
+      "Gas": 0.057,
       "Hydro": 0.0474,
-      "Nuclear": 0.0443,
+      "Nuclear": 0.0445,
       "Other Fossil": 0.0046,
       "Other Renewables": 0.0013,
       "Solar": 0.006,
@@ -16726,25 +16726,25 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Coal": 0.8161,
+      "Coal": 0.814,
       "Gas": 0.0004,
       "Hydro": 0.0047,
-      "Nuclear": 0.0331,
-      "Other Fossil": 0.0132,
+      "Nuclear": 0.0332,
+      "Other Fossil": 0.0143,
       "Other Renewables": 0.001,
-      "Solar": 0.0844,
-      "Wind": 0.0471
+      "Solar": 0.085,
+      "Wind": 0.0473
     },
     "2025": {
       "Bioenergy": 0,
-      "Coal": 0.7999,
+      "Coal": 0.7735,
       "Gas": 0,
-      "Hydro": 0.003,
-      "Nuclear": 0.034,
-      "Other Fossil": 0.0091,
-      "Other Renewables": 0.001,
-      "Solar": 0.1067,
-      "Wind": 0.0462
+      "Hydro": 0.0032,
+      "Nuclear": 0.0354,
+      "Other Fossil": 0.0222,
+      "Other Renewables": 0.0011,
+      "Solar": 0.1159,
+      "Wind": 0.0487
     }
   },
   "ZM": {