@digital4better/data 1.3.18 → 1.3.19

package/data/mix/country-yearly-green.json

@@ -75,16 +75,16 @@
       "Wind": 0.1321
     },
     "2024": {
-      "Bioenergy": 0.0379,
-      "Hydro": 0.6672,
+      "Bioenergy": 0.0378,
+      "Hydro": 0.6674,
       "Solar": 0.1617,
       "Wind": 0.1331
     },
     "2025": {
-      "Bioenergy": 0.0347,
-      "Hydro": 0.6262,
-      "Solar": 0.1969,
-      "Wind": 0.1421
+      "Bioenergy": 0.0352,
+      "Hydro": 0.6248,
+      "Solar": 0.1984,
+      "Wind": 0.1416
     }
   },
   "AG": {
@@ -134,7 +134,7 @@
   "AL": {
     "2019": {
       "Bioenergy": 0.0112,
-      "Hydro": 0.9356,
+      "Hydro": 0.9357,
       "Solar": 0.0159,
       "Wind": 0.0372
     },
@@ -145,7 +145,7 @@
       "Wind": 0.0421
     },
     "2021": {
-      "Bioenergy": 0.0121,
+      "Bioenergy": 0.012,
       "Hydro": 0.9284,
       "Solar": 0.0197,
       "Wind": 0.0399
@@ -160,19 +160,19 @@
       "Bioenergy": 0.0109,
       "Hydro": 0.9113,
       "Solar": 0.0284,
-      "Wind": 0.0494
+      "Wind": 0.0493
     },
     "2024": {
-      "Bioenergy": 0.011,
-      "Hydro": 0.9063,
+      "Bioenergy": 0.0109,
+      "Hydro": 0.9061,
       "Solar": 0.0332,
-      "Wind": 0.0495
+      "Wind": 0.0499
     },
     "2025": {
       "Bioenergy": 0.0108,
-      "Hydro": 0.8986,
-      "Solar": 0.0453,
-      "Wind": 0.0453
+      "Hydro": 0.8987,
+      "Solar": 0.0452,
+      "Wind": 0.0454
     }
   },
   "AM": {
@@ -360,7 +360,7 @@
     },
     "2020": {
       "Bioenergy": 0.0345,
-      "Hydro": 0.7844,
+      "Hydro": 0.7845,
       "Solar": 0.0362,
       "Wind": 0.1449
     },
@@ -389,10 +389,10 @@
       "Wind": 0.1511
     },
     "2025": {
-      "Bioenergy": 0.0316,
-      "Hydro": 0.6443,
-      "Solar": 0.1826,
-      "Wind": 0.1415
+      "Bioenergy": 0.0321,
+      "Hydro": 0.6388,
+      "Solar": 0.1854,
+      "Wind": 0.1437
     }
   },
   "AU": {
@@ -566,9 +566,9 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.8611,
-      "Solar": 0.102,
-      "Wind": 0.0369
+      "Hydro": 0.8442,
+      "Solar": 0.1196,
+      "Wind": 0.0362
     }
   },
   "BB": {
@@ -647,16 +647,16 @@
       "Wind": 0.1934
     },
     "2024": {
-      "Bioenergy": 0.0504,
-      "Hydro": 0.4305,
+      "Bioenergy": 0.0502,
+      "Hydro": 0.4306,
       "Solar": 0.3423,
       "Wind": 0.1768
     },
     "2025": {
-      "Bioenergy": 0.0457,
-      "Hydro": 0.353,
-      "Solar": 0.4136,
-      "Wind": 0.1876
+      "Bioenergy": 0.0464,
+      "Hydro": 0.3516,
+      "Solar": 0.4152,
+      "Wind": 0.1868
     }
   },
   "BE": {
@@ -691,16 +691,16 @@
       "Wind": 0.6097
     },
     "2024": {
-      "Bioenergy": 0.0375,
-      "Hydro": 0.08,
-      "Solar": 0.3401,
-      "Wind": 0.5425
+      "Bioenergy": 0.0374,
+      "Hydro": 0.0799,
+      "Solar": 0.34,
+      "Wind": 0.5428
     },
     "2025": {
       "Bioenergy": 0.0364,
-      "Hydro": 0.0794,
-      "Solar": 0.4769,
-      "Wind": 0.4073
+      "Hydro": 0.0793,
+      "Solar": 0.4768,
+      "Wind": 0.4075
     }
   },
   "BF": {
@@ -780,9 +780,9 @@
     },
     "2024": {
       "Bioenergy": 0.0171,
-      "Hydro": 0.3193,
-      "Solar": 0.5028,
-      "Wind": 0.1609
+      "Hydro": 0.3192,
+      "Solar": 0.5027,
+      "Wind": 0.161
     },
     "2025": {
       "Bioenergy": 0.011,
@@ -1246,7 +1246,7 @@
     },
     "2021": {
       "Bioenergy": 0.2409,
-      "Hydro": 0.4051,
+      "Hydro": 0.405,
       "Solar": 0.1865,
       "Wind": 0.1676
     },
@@ -1263,10 +1263,10 @@
       "Wind": 0.1517
     },
     "2024": {
-      "Bioenergy": 0.2935,
-      "Hydro": 0.369,
+      "Bioenergy": 0.2934,
+      "Hydro": 0.3688,
       "Solar": 0.1865,
-      "Wind": 0.1511
+      "Wind": 0.1513
     },
     "2025": {
       "Bioenergy": 0.4571,
@@ -1357,10 +1357,10 @@
       "Wind": 0.1145
     },
     "2025": {
-      "Bioenergy": 0.0225,
-      "Hydro": 0.8355,
-      "Solar": 0.016,
-      "Wind": 0.126
+      "Bioenergy": 0.024,
+      "Hydro": 0.8368,
+      "Solar": 0.0167,
+      "Wind": 0.1225
     }
   },
   "CD": {
@@ -1534,8 +1534,8 @@
     },
     "2025": {
       "Bioenergy": 0.0023,
-      "Hydro": 0.7823,
-      "Solar": 0.2022,
+      "Hydro": 0.7842,
+      "Solar": 0.2003,
       "Wind": 0.0133
     }
   },
@@ -1749,14 +1749,14 @@
     "2024": {
       "Bioenergy": 0.06,
       "Hydro": 0.3876,
-      "Solar": 0.2523,
+      "Solar": 0.2524,
       "Wind": 0.3
     },
     "2025": {
-      "Bioenergy": 0.051,
-      "Hydro": 0.3336,
-      "Solar": 0.3205,
-      "Wind": 0.2949
+      "Bioenergy": 0.0532,
+      "Hydro": 0.3342,
+      "Solar": 0.3203,
+      "Wind": 0.2923
     }
   },
   "CO": {
@@ -1975,8 +1975,8 @@
     "2025": {
       "Bioenergy": 0,
       "Hydro": 0,
-      "Solar": 0.8666,
-      "Wind": 0.1334
+      "Solar": 0.8778,
+      "Wind": 0.1222
     }
   },
   "CZ": {
@@ -2026,7 +2026,7 @@
   "DE": {
     "2019": {
       "Bioenergy": 0.1829,
-      "Hydro": 0.088,
+      "Hydro": 0.0881,
       "Solar": 0.1978,
       "Wind": 0.5313
     },
@@ -2049,22 +2049,22 @@
       "Wind": 0.4975
     },
     "2023": {
-      "Bioenergy": 0.1586,
+      "Bioenergy": 0.1587,
       "Hydro": 0.0868,
       "Solar": 0.2434,
       "Wind": 0.5111
     },
     "2024": {
-      "Bioenergy": 0.1521,
-      "Hydro": 0.0997,
-      "Solar": 0.2697,
-      "Wind": 0.4786
+      "Bioenergy": 0.1477,
+      "Hydro": 0.0963,
+      "Solar": 0.2661,
+      "Wind": 0.4899
     },
     "2025": {
-      "Bioenergy": 0.1442,
-      "Hydro": 0.0791,
-      "Solar": 0.3743,
-      "Wind": 0.4024
+      "Bioenergy": 0.1441,
+      "Hydro": 0.079,
+      "Solar": 0.3742,
+      "Wind": 0.4027
     }
   },
   "DJ": {
@@ -2115,7 +2115,7 @@
     "2019": {
       "Bioenergy": 0.1705,
       "Hydro": 0.0484,
-      "Solar": 0.0547,
+      "Solar": 0.0548,
       "Wind": 0.7264
     },
     "2020": {
@@ -2133,7 +2133,7 @@
     "2022": {
       "Bioenergy": 0.1599,
       "Hydro": 0.0183,
-      "Solar": 0.0907,
+      "Solar": 0.0906,
       "Wind": 0.7312
     },
     "2023": {
@@ -2144,15 +2144,15 @@
     },
     "2024": {
       "Bioenergy": 0.1375,
-      "Hydro": 0.0247,
-      "Solar": 0.1362,
-      "Wind": 0.7017
+      "Hydro": 0.0246,
+      "Solar": 0.1361,
+      "Wind": 0.7018
     },
     "2025": {
       "Bioenergy": 0.1166,
-      "Hydro": 0.0459,
-      "Solar": 0.2121,
-      "Wind": 0.6253
+      "Hydro": 0.0458,
+      "Solar": 0.212,
+      "Wind": 0.6255
     }
   },
   "DM": {
@@ -2334,19 +2334,19 @@
   "EE": {
     "2019": {
       "Bioenergy": 0.3153,
-      "Hydro": 0.196,
+      "Hydro": 0.1959,
       "Solar": 0.0375,
       "Wind": 0.4512
     },
     "2020": {
-      "Bioenergy": 0.2353,
-      "Hydro": 0.2296,
+      "Bioenergy": 0.2354,
+      "Hydro": 0.2295,
       "Solar": 0.0867,
       "Wind": 0.4484
     },
     "2021": {
-      "Bioenergy": 0.223,
-      "Hydro": 0.1843,
+      "Bioenergy": 0.2229,
+      "Hydro": 0.1842,
       "Solar": 0.1682,
       "Wind": 0.4246
     },
@@ -2363,16 +2363,16 @@
       "Wind": 0.3726
     },
     "2024": {
-      "Bioenergy": 0.1396,
-      "Hydro": 0.1357,
-      "Solar": 0.3073,
-      "Wind": 0.4173
+      "Bioenergy": 0.1395,
+      "Hydro": 0.1356,
+      "Solar": 0.3071,
+      "Wind": 0.4178
     },
     "2025": {
-      "Bioenergy": 0.1247,
-      "Hydro": 0.1066,
-      "Solar": 0.3912,
-      "Wind": 0.3775
+      "Bioenergy": 0.1246,
+      "Hydro": 0.1065,
+      "Solar": 0.3909,
+      "Wind": 0.3779
     }
   },
   "EG": {
@@ -2586,13 +2586,13 @@
       "Bioenergy": 0.209,
       "Hydro": 0.3272,
       "Solar": 0.0315,
-      "Wind": 0.4323
+      "Wind": 0.4324
     },
     "2025": {
-      "Bioenergy": 0.2137,
-      "Hydro": 0.2969,
-      "Solar": 0.0501,
-      "Wind": 0.4392
+      "Bioenergy": 0.2066,
+      "Hydro": 0.3048,
+      "Solar": 0.0514,
+      "Wind": 0.4372
     }
   },
   "FJ": {
@@ -2818,7 +2818,7 @@
   "GB": {
     "2019": {
       "Bioenergy": 0.1779,
-      "Hydro": 0.0712,
+      "Hydro": 0.0711,
       "Solar": 0.1231,
       "Wind": 0.6278
     },
@@ -2847,16 +2847,16 @@
       "Wind": 0.7013
     },
     "2024": {
-      "Bioenergy": 0.1511,
-      "Hydro": 0.0741,
+      "Bioenergy": 0.151,
+      "Hydro": 0.074,
       "Solar": 0.1272,
-      "Wind": 0.6476
+      "Wind": 0.6478
     },
     "2025": {
       "Bioenergy": 0.1568,
-      "Hydro": 0.0623,
-      "Solar": 0.1942,
-      "Wind": 0.5867
+      "Hydro": 0.0622,
+      "Solar": 0.1941,
+      "Wind": 0.5869
     }
   },
   "GD": {
@@ -3327,20 +3327,20 @@
     "2023": {
       "Bioenergy": 0.0064,
       "Hydro": 0.1879,
-      "Solar": 0.3611,
+      "Solar": 0.3612,
       "Wind": 0.4446
     },
     "2024": {
-      "Bioenergy": 0.0015,
+      "Bioenergy": 0.0014,
       "Hydro": 0.1142,
       "Solar": 0.4489,
-      "Wind": 0.4354
+      "Wind": 0.4355
     },
     "2025": {
       "Bioenergy": 0.0009,
       "Hydro": 0.0927,
       "Solar": 0.5347,
-      "Wind": 0.3716
+      "Wind": 0.3717
     }
   },
   "GT": {
@@ -3551,16 +3551,16 @@
       "Wind": 0.2479
     },
     "2024": {
-      "Bioenergy": 0.1059,
-      "Hydro": 0.3949,
-      "Solar": 0.2578,
+      "Bioenergy": 0.1057,
+      "Hydro": 0.3951,
+      "Solar": 0.2579,
       "Wind": 0.2413
     },
     "2025": {
-      "Bioenergy": 0.0944,
-      "Hydro": 0.3471,
-      "Solar": 0.3109,
-      "Wind": 0.2476
+      "Bioenergy": 0.0951,
+      "Hydro": 0.3454,
+      "Solar": 0.3131,
+      "Wind": 0.2464
     }
   },
   "HN": {
@@ -3627,28 +3627,28 @@
       "Wind": 0.2351
     },
     "2022": {
-      "Bioenergy": 0.0846,
+      "Bioenergy": 0.0847,
       "Hydro": 0.5612,
       "Solar": 0.0516,
       "Wind": 0.3025
     },
     "2023": {
       "Bioenergy": 0.0596,
-      "Hydro": 0.6401,
+      "Hydro": 0.6402,
       "Solar": 0.0515,
       "Wind": 0.2487
     },
     "2024": {
-      "Bioenergy": 0.0633,
-      "Hydro": 0.5499,
+      "Bioenergy": 0.0632,
+      "Hydro": 0.5497,
       "Solar": 0.1121,
-      "Wind": 0.2746
+      "Wind": 0.275
     },
     "2025": {
-      "Bioenergy": 0.0589,
+      "Bioenergy": 0.0588,
       "Hydro": 0.4722,
-      "Solar": 0.172,
-      "Wind": 0.2969
+      "Solar": 0.1718,
+      "Wind": 0.2971
     }
   },
   "HT": {
@@ -3705,38 +3705,38 @@
     "2020": {
       "Bioenergy": 0.1611,
       "Hydro": 0.2775,
-      "Solar": 0.3365,
-      "Wind": 0.2249
+      "Solar": 0.3366,
+      "Wind": 0.2248
     },
     "2021": {
       "Bioenergy": 0.1478,
       "Hydro": 0.2309,
       "Solar": 0.4306,
-      "Wind": 0.1908
+      "Wind": 0.1907
     },
     "2022": {
       "Bioenergy": 0.1387,
       "Hydro": 0.1865,
-      "Solar": 0.4906,
-      "Wind": 0.1842
+      "Solar": 0.4907,
+      "Wind": 0.1841
     },
     "2023": {
       "Bioenergy": 0.0846,
       "Hydro": 0.1675,
       "Solar": 0.5818,
-      "Wind": 0.1661
+      "Wind": 0.166
     },
     "2024": {
-      "Bioenergy": 0.0805,
-      "Hydro": 0.1383,
-      "Solar": 0.645,
-      "Wind": 0.1362
+      "Bioenergy": 0.0804,
+      "Hydro": 0.1381,
+      "Solar": 0.6447,
+      "Wind": 0.1368
     },
     "2025": {
       "Bioenergy": 0.0903,
       "Hydro": 0.0828,
       "Solar": 0.743,
-      "Wind": 0.0839
+      "Wind": 0.084
     }
   },
   "ID": {
@@ -3778,9 +3778,9 @@
     },
     "2025": {
       "Bioenergy": 0.3542,
-      "Hydro": 0.6196,
-      "Solar": 0.0084,
-      "Wind": 0.0178
+      "Hydro": 0.6195,
+      "Solar": 0.0085,
+      "Wind": 0.0177
     }
   },
   "IE": {
@@ -3792,15 +3792,15 @@
     },
     "2020": {
       "Bioenergy": 0.0186,
-      "Hydro": 0.1144,
+      "Hydro": 0.1143,
       "Solar": 0.0097,
-      "Wind": 0.8573
+      "Wind": 0.8574
     },
     "2021": {
       "Bioenergy": 0.0187,
       "Hydro": 0.112,
       "Solar": 0.0123,
-      "Wind": 0.857
+      "Wind": 0.8571
     },
     "2022": {
       "Bioenergy": 0.016,
@@ -3816,15 +3816,15 @@
     },
     "2024": {
       "Bioenergy": 0.0179,
-      "Hydro": 0.1136,
-      "Solar": 0.0758,
-      "Wind": 0.7927
+      "Hydro": 0.1135,
+      "Solar": 0.0757,
+      "Wind": 0.7929
     },
     "2025": {
       "Bioenergy": 0.0197,
       "Hydro": 0.1057,
-      "Solar": 0.1357,
-      "Wind": 0.7388
+      "Solar": 0.1356,
+      "Wind": 0.739
     }
   },
   "IL": {
@@ -4058,7 +4058,7 @@
       "Bioenergy": 0.1634,
       "Hydro": 0.4249,
       "Solar": 0.22,
-      "Wind": 0.1918
+      "Wind": 0.1917
     },
     "2021": {
       "Bioenergy": 0.1585,
@@ -4076,19 +4076,19 @@
       "Bioenergy": 0.1324,
       "Hydro": 0.3577,
       "Solar": 0.2701,
-      "Wind": 0.2399
+      "Wind": 0.2398
     },
     "2024": {
-      "Bioenergy": 0.1179,
-      "Hydro": 0.3957,
+      "Bioenergy": 0.1178,
+      "Hydro": 0.3956,
       "Solar": 0.2813,
-      "Wind": 0.205
+      "Wind": 0.2053
     },
     "2025": {
       "Bioenergy": 0.1048,
-      "Hydro": 0.2966,
+      "Hydro": 0.2965,
       "Solar": 0.3984,
-      "Wind": 0.2002
+      "Wind": 0.2003
     }
   },
   "JM": {
@@ -4217,10 +4217,10 @@
       "Wind": 0.0718
     },
     "2025": {
-      "Bioenergy": 0.2154,
-      "Hydro": 0.2657,
-      "Solar": 0.4366,
-      "Wind": 0.0823
+      "Bioenergy": 0.2032,
+      "Hydro": 0.2525,
+      "Solar": 0.4687,
+      "Wind": 0.0756
     }
   },
   "KE": {
@@ -4306,7 +4306,7 @@
     },
     "2025": {
       "Bioenergy": 0.0018,
-      "Hydro": 0.982,
+      "Hydro": 0.9819,
       "Solar": 0.009,
       "Wind": 0.0072
     }
@@ -4344,15 +4344,15 @@
     },
     "2024": {
       "Bioenergy": 0.0307,
-      "Hydro": 0.8606,
+      "Hydro": 0.8607,
       "Solar": 0.0666,
       "Wind": 0.0421
     },
     "2025": {
-      "Bioenergy": 0.0298,
-      "Hydro": 0.8441,
-      "Solar": 0.0796,
-      "Wind": 0.0465
+      "Bioenergy": 0.03,
+      "Hydro": 0.8435,
+      "Solar": 0.0802,
+      "Wind": 0.0464
     }
   },
   "KI": {
@@ -4569,10 +4569,10 @@
       "Wind": 0.0639
     },
     "2025": {
-      "Bioenergy": 0.1916,
-      "Hydro": 0.0652,
-      "Solar": 0.6807,
-      "Wind": 0.0624
+      "Bioenergy": 0.1965,
+      "Hydro": 0.0571,
+      "Solar": 0.6856,
+      "Wind": 0.0607
     }
   },
   "KW": {
@@ -4702,9 +4702,9 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.6152,
-      "Solar": 0.1226,
-      "Wind": 0.2622
+      "Hydro": 0.6147,
+      "Solar": 0.1255,
+      "Wind": 0.2597
     }
   },
   "LA": {
@@ -4974,18 +4974,18 @@
   "LT": {
     "2019": {
       "Bioenergy": 0.1294,
-      "Hydro": 0.3679,
+      "Hydro": 0.3678,
       "Solar": 0.0689,
       "Wind": 0.4338
     },
     "2020": {
       "Bioenergy": 0.1269,
-      "Hydro": 0.3368,
+      "Hydro": 0.3367,
       "Solar": 0.0717,
       "Wind": 0.4647
     },
     "2021": {
-      "Bioenergy": 0.1303,
+      "Bioenergy": 0.1302,
       "Hydro": 0.3622,
       "Solar": 0.0901,
       "Wind": 0.4174
@@ -5003,22 +5003,22 @@
       "Wind": 0.5074
     },
     "2024": {
-      "Bioenergy": 0.0515,
-      "Hydro": 0.1841,
-      "Solar": 0.2364,
-      "Wind": 0.5281
+      "Bioenergy": 0.0513,
+      "Hydro": 0.1838,
+      "Solar": 0.2362,
+      "Wind": 0.5286
     },
     "2025": {
       "Bioenergy": 0.0325,
-      "Hydro": 0.1094,
-      "Solar": 0.32,
-      "Wind": 0.5381
+      "Hydro": 0.1093,
+      "Solar": 0.3199,
+      "Wind": 0.5383
     }
   },
   "LU": {
     "2019": {
       "Bioenergy": 0.149,
-      "Hydro": 0.3871,
+      "Hydro": 0.387,
       "Solar": 0.1304,
       "Wind": 0.3335
     },
@@ -5026,7 +5026,7 @@
       "Bioenergy": 0.1647,
       "Hydro": 0.3499,
       "Solar": 0.132,
-      "Wind": 0.3535
+      "Wind": 0.3534
     },
     "2021": {
       "Bioenergy": 0.1848,
@@ -5035,7 +5035,7 @@
       "Wind": 0.3189
     },
     "2022": {
-      "Bioenergy": 0.1871,
+      "Bioenergy": 0.1872,
       "Hydro": 0.2883,
       "Solar": 0.1961,
       "Wind": 0.3285
@@ -5047,16 +5047,16 @@
       "Wind": 0.4008
     },
     "2024": {
-      "Bioenergy": 0.1381,
-      "Hydro": 0.2926,
-      "Solar": 0.2204,
-      "Wind": 0.3489
+      "Bioenergy": 0.1378,
+      "Hydro": 0.292,
+      "Solar": 0.2202,
+      "Wind": 0.35
     },
     "2025": {
-      "Bioenergy": 0.1273,
-      "Hydro": 0.2332,
-      "Solar": 0.3329,
-      "Wind": 0.3066
+      "Bioenergy": 0.1272,
+      "Hydro": 0.2331,
+      "Solar": 0.3326,
+      "Wind": 0.3071
     }
   },
   "LV": {
@@ -5070,13 +5070,13 @@
       "Bioenergy": 0.1523,
       "Hydro": 0.75,
       "Solar": 0.0186,
-      "Wind": 0.0792
+      "Wind": 0.0791
     },
     "2021": {
       "Bioenergy": 0.1471,
-      "Hydro": 0.7506,
+      "Hydro": 0.7507,
       "Solar": 0.024,
-      "Wind": 0.0783
+      "Wind": 0.0782
     },
     "2022": {
       "Bioenergy": 0.1007,
@@ -5086,21 +5086,21 @@
     },
     "2023": {
       "Bioenergy": 0.0583,
-      "Hydro": 0.775,
+      "Hydro": 0.7751,
       "Solar": 0.0657,
       "Wind": 0.101
     },
     "2024": {
-      "Bioenergy": 0.0897,
-      "Hydro": 0.679,
-      "Solar": 0.1241,
-      "Wind": 0.1073
+      "Bioenergy": 0.0896,
+      "Hydro": 0.6786,
+      "Solar": 0.124,
+      "Wind": 0.1077
     },
     "2025": {
       "Bioenergy": 0.0817,
       "Hydro": 0.6712,
-      "Solar": 0.1861,
-      "Wind": 0.061
+      "Solar": 0.186,
+      "Wind": 0.0611
     }
   },
   "LY": {
@@ -5193,14 +5193,14 @@
   },
   "MD": {
     "2019": {
-      "Bioenergy": 0.0837,
-      "Hydro": 0.7092,
-      "Solar": 0.0349,
+      "Bioenergy": 0.0836,
+      "Hydro": 0.7093,
+      "Solar": 0.0348,
       "Wind": 0.1723
     },
     "2020": {
       "Bioenergy": 0.0132,
-      "Hydro": 0.9173,
+      "Hydro": 0.9174,
       "Solar": 0.0099,
       "Wind": 0.0596
     },
@@ -5212,9 +5212,9 @@
     },
     "2022": {
       "Bioenergy": 0.0475,
-      "Hydro": 0.6975,
+      "Hydro": 0.6976,
       "Solar": 0.0778,
-      "Wind": 0.1772
+      "Wind": 0.1771
     },
     "2023": {
       "Bioenergy": 0.0113,
@@ -5223,16 +5223,16 @@
       "Wind": 0.1267
     },
     "2024": {
-      "Bioenergy": 0.0123,
-      "Hydro": 0.6419,
-      "Solar": 0.1684,
-      "Wind": 0.1774
+      "Bioenergy": 0.0122,
+      "Hydro": 0.6417,
+      "Solar": 0.1683,
+      "Wind": 0.1778
     },
     "2025": {
       "Bioenergy": 0.0081,
       "Hydro": 0.6337,
-      "Solar": 0.3241,
-      "Wind": 0.0341
+      "Solar": 0.324,
+      "Wind": 0.0342
     }
   },
   "ME": {
@@ -5268,15 +5268,15 @@
     },
     "2024": {
       "Bioenergy": 0.0069,
-      "Hydro": 0.7723,
+      "Hydro": 0.7721,
       "Solar": 0.0571,
-      "Wind": 0.1637
+      "Wind": 0.1639
     },
     "2025": {
-      "Bioenergy": 0.0239,
-      "Hydro": 0.5895,
-      "Solar": 0.1676,
-      "Wind": 0.2189
+      "Bioenergy": 0.0238,
+      "Hydro": 0.5896,
+      "Solar": 0.1672,
+      "Wind": 0.2194
     }
   },
   "MG": {
@@ -5326,12 +5326,12 @@
   "MK": {
     "2019": {
       "Bioenergy": 0.0676,
-      "Hydro": 0.7699,
-      "Solar": 0.0192,
-      "Wind": 0.1433
+      "Hydro": 0.77,
+      "Solar": 0.0191,
+      "Wind": 0.1432
     },
     "2020": {
-      "Bioenergy": 0.0715,
+      "Bioenergy": 0.0716,
       "Hydro": 0.75,
       "Solar": 0.0263,
       "Wind": 0.1521
@@ -5355,16 +5355,16 @@
       "Wind": 0.0855
     },
     "2024": {
-      "Bioenergy": 0.054,
-      "Hydro": 0.6825,
-      "Solar": 0.1423,
-      "Wind": 0.1212
+      "Bioenergy": 0.0541,
+      "Hydro": 0.6823,
+      "Solar": 0.1422,
+      "Wind": 0.1214
     },
     "2025": {
-      "Bioenergy": 0.0285,
-      "Hydro": 0.6109,
-      "Solar": 0.1752,
-      "Wind": 0.1853
+      "Bioenergy": 0.0284,
+      "Hydro": 0.611,
+      "Solar": 0.1749,
+      "Wind": 0.1856
     }
   },
   "ML": {
@@ -5531,16 +5531,16 @@
       "Wind": 0.2232
     },
     "2024": {
-      "Bioenergy": 0.1937,
-      "Hydro": 0.3581,
+      "Bioenergy": 0.1934,
+      "Hydro": 0.3583,
       "Solar": 0.2294,
       "Wind": 0.2188
     },
     "2025": {
-      "Bioenergy": 0.1761,
-      "Hydro": 0.3174,
-      "Solar": 0.2802,
-      "Wind": 0.2263
+      "Bioenergy": 0.1766,
+      "Hydro": 0.3158,
+      "Solar": 0.2823,
+      "Wind": 0.2253
     }
   },
   "MQ": {
@@ -5678,20 +5678,20 @@
   "MT": {
     "2019": {
       "Bioenergy": 0.0877,
-      "Hydro": 0.5231,
+      "Hydro": 0.5232,
       "Solar": 0.102,
       "Wind": 0.2871
     },
     "2020": {
-      "Bioenergy": 0.0852,
+      "Bioenergy": 0.0851,
       "Hydro": 0.512,
       "Solar": 0.1024,
-      "Wind": 0.3005
+      "Wind": 0.3004
     },
     "2021": {
       "Bioenergy": 0.0903,
-      "Hydro": 0.4972,
-      "Solar": 0.1114,
+      "Hydro": 0.4973,
+      "Solar": 0.1115,
       "Wind": 0.301
     },
     "2022": {
@@ -5707,16 +5707,16 @@
       "Wind": 0.116
     },
     "2024": {
-      "Bioenergy": 0.0299,
-      "Hydro": 0.1915,
-      "Solar": 0.6459,
-      "Wind": 0.1327
+      "Bioenergy": 0.0297,
+      "Hydro": 0.191,
+      "Solar": 0.6457,
+      "Wind": 0.1336
     },
     "2025": {
-      "Bioenergy": 0.0257,
-      "Hydro": 0.1537,
-      "Solar": 0.7118,
-      "Wind": 0.1088
+      "Bioenergy": 0.0275,
+      "Hydro": 0.1664,
+      "Solar": 0.6894,
+      "Wind": 0.1167
     }
   },
   "MU": {
@@ -5889,10 +5889,10 @@
       "Wind": 0.3199
     },
     "2025": {
-      "Bioenergy": 0.0012,
-      "Hydro": 0.3805,
-      "Solar": 0.2874,
-      "Wind": 0.3309
+      "Bioenergy": 0.0013,
+      "Hydro": 0.3763,
+      "Solar": 0.294,
+      "Wind": 0.3285
     }
   },
   "MY": {
@@ -5933,8 +5933,8 @@
       "Wind": 0.0001
     },
     "2025": {
-      "Bioenergy": 0.1087,
-      "Hydro": 0.8096,
+      "Bioenergy": 0.1091,
+      "Hydro": 0.8092,
       "Solar": 0.0817,
       "Wind": 0
     }
@@ -6329,10 +6329,10 @@
       "Wind": 0.0195
     },
     "2025": {
-      "Bioenergy": 0.0049,
-      "Hydro": 0.9367,
-      "Solar": 0.0369,
-      "Wind": 0.0216
+      "Bioenergy": 0.005,
+      "Hydro": 0.9364,
+      "Solar": 0.0371,
+      "Wind": 0.0215
     }
   },
   "NR": {
@@ -6462,9 +6462,9 @@
     },
     "2025": {
       "Bioenergy": 0.0006,
-      "Hydro": 0.8746,
+      "Hydro": 0.8715,
       "Solar": 0,
-      "Wind": 0.1248
+      "Wind": 0.1279
     }
   },
   "OM": {
@@ -6593,10 +6593,10 @@
       "Wind": 0.1075
     },
     "2025": {
-      "Bioenergy": 0.0082,
-      "Hydro": 0.8611,
-      "Solar": 0.0402,
-      "Wind": 0.0905
+      "Bioenergy": 0.0086,
+      "Hydro": 0.8569,
+      "Solar": 0.0409,
+      "Wind": 0.0935
     }
   },
   "PF": {
@@ -6780,7 +6780,7 @@
       "Bioenergy": 0.1058,
       "Hydro": 0.1468,
       "Solar": 0.0478,
-      "Wind": 0.6996
+      "Wind": 0.6997
     },
     "2020": {
       "Bioenergy": 0.0963,
@@ -6790,7 +6790,7 @@
     },
     "2021": {
       "Bioenergy": 0.081,
-      "Hydro": 0.0975,
+      "Hydro": 0.0974,
       "Solar": 0.1924,
       "Wind": 0.6291
     },
@@ -6808,15 +6808,15 @@
     },
     "2024": {
       "Bioenergy": 0.0521,
-      "Hydro": 0.0524,
-      "Solar": 0.3778,
-      "Wind": 0.5178
+      "Hydro": 0.0523,
+      "Solar": 0.3777,
+      "Wind": 0.5179
     },
     "2025": {
       "Bioenergy": 0.0593,
       "Hydro": 0.0361,
       "Solar": 0.4753,
-      "Wind": 0.4293
+      "Wind": 0.4294
     }
   },
   "PM": {
@@ -6968,7 +6968,7 @@
       "Bioenergy": 0.1208,
       "Hydro": 0.3503,
       "Solar": 0.0815,
-      "Wind": 0.4475
+      "Wind": 0.4474
     },
     "2022": {
       "Bioenergy": 0.127,
@@ -6984,15 +6984,15 @@
     },
     "2024": {
       "Bioenergy": 0.0835,
-      "Hydro": 0.3394,
+      "Hydro": 0.3393,
       "Solar": 0.2011,
-      "Wind": 0.3759
+      "Wind": 0.3761
     },
     "2025": {
-      "Bioenergy": 0.071,
-      "Hydro": 0.3547,
-      "Solar": 0.2448,
-      "Wind": 0.3295
+      "Bioenergy": 0.0711,
+      "Hydro": 0.3555,
+      "Solar": 0.2431,
+      "Wind": 0.3303
     }
   },
   "PY": {
@@ -7160,15 +7160,15 @@
     },
     "2024": {
       "Bioenergy": 0.0205,
-      "Hydro": 0.559,
+      "Hydro": 0.5589,
       "Solar": 0.1668,
-      "Wind": 0.2537
+      "Wind": 0.2538
     },
     "2025": {
       "Bioenergy": 0.0217,
       "Hydro": 0.4828,
-      "Solar": 0.2628,
-      "Wind": 0.2327
+      "Solar": 0.2627,
+      "Wind": 0.2328
     }
   },
   "RS": {
@@ -7192,8 +7192,8 @@
     },
     "2022": {
       "Bioenergy": 0.0318,
-      "Hydro": 0.824,
-      "Solar": 0.0179,
+      "Hydro": 0.8241,
+      "Solar": 0.0178,
       "Wind": 0.1263
     },
     "2023": {
@@ -7204,9 +7204,9 @@
     },
     "2024": {
       "Bioenergy": 0.025,
-      "Hydro": 0.8495,
+      "Hydro": 0.8494,
       "Solar": 0.0164,
-      "Wind": 0.109
+      "Wind": 0.1092
     },
     "2025": {
       "Bioenergy": 0.0311,
@@ -7518,9 +7518,9 @@
     },
     "2025": {
       "Bioenergy": 0.049,
-      "Hydro": 0.5726,
-      "Solar": 0.0493,
-      "Wind": 0.3291
+      "Hydro": 0.5728,
+      "Solar": 0.049,
+      "Wind": 0.3292
     }
   },
   "SG": {
@@ -7561,10 +7561,10 @@
       "Wind": 0.0013
     },
     "2025": {
-      "Bioenergy": 0.0036,
-      "Hydro": 0.0221,
-      "Solar": 0.9594,
-      "Wind": 0.0148
+      "Bioenergy": 0.0032,
+      "Hydro": 0.018,
+      "Solar": 0.9659,
+      "Wind": 0.0129
     }
   },
   "SH": {
@@ -7634,7 +7634,7 @@
       "Bioenergy": 0.0302,
       "Hydro": 0.8125,
       "Solar": 0.1127,
-      "Wind": 0.0446
+      "Wind": 0.0445
     },
     "2023": {
       "Bioenergy": 0.0133,
@@ -8002,7 +8002,7 @@
     },
     "2025": {
       "Bioenergy": 0.2822,
-      "Hydro": 0.3318,
+      "Hydro": 0.3319,
       "Solar": 0.2902,
       "Wind": 0.0958
     }
@@ -8265,10 +8265,10 @@
       "Wind": 0.1575
     },
     "2025": {
-      "Bioenergy": 0.2863,
-      "Hydro": 0.264,
-      "Solar": 0.3119,
-      "Wind": 0.1378
+      "Bioenergy": 0.2864,
+      "Hydro": 0.2635,
+      "Solar": 0.3126,
+      "Wind": 0.1375
     }
   },
   "TJ": {
@@ -8529,10 +8529,10 @@
       "Wind": 0.2512
     },
     "2025": {
-      "Bioenergy": 0.0544,
-      "Hydro": 0.4365,
-      "Solar": 0.2586,
-      "Wind": 0.2505
+      "Bioenergy": 0.0545,
+      "Hydro": 0.4264,
+      "Solar": 0.258,
+      "Wind": 0.2611
     }
   },
   "TT": {
@@ -8793,10 +8793,10 @@
       "Wind": 0.4378
     },
     "2025": {
-      "Bioenergy": 0.0391,
-      "Hydro": 0.2138,
-      "Solar": 0.3491,
-      "Wind": 0.3979
+      "Bioenergy": 0.0393,
+      "Hydro": 0.2142,
+      "Solar": 0.3494,
+      "Wind": 0.3972
     }
   },
   "UY": {
@@ -8881,9 +8881,9 @@
       "Wind": 0.0141
     },
     "2025": {
-      "Bioenergy": 0.0038,
-      "Hydro": 0.9591,
-      "Solar": 0.0213,
+      "Bioenergy": 0.0039,
+      "Hydro": 0.9589,
+      "Solar": 0.0215,
       "Wind": 0.0157
     }
   },
@@ -9227,16 +9227,16 @@
       "Wind": 0.464
     },
     "2024": {
-      "Bioenergy": 0.0279,
-      "Hydro": 0.3916,
-      "Solar": 0.0435,
-      "Wind": 0.5371
+      "Bioenergy": 0.0281,
+      "Hydro": 0.3911,
+      "Solar": 0.0434,
+      "Wind": 0.5374
     },
     "2025": {
-      "Bioenergy": 0.0357,
+      "Bioenergy": 0.0356,
       "Hydro": 0.4365,
-      "Solar": 0.114,
-      "Wind": 0.4138
+      "Solar": 0.1137,
+      "Wind": 0.4142
     }
   },
   "YE": {
@@ -9322,9 +9322,9 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.0635,
-      "Solar": 0.5833,
-      "Wind": 0.3532
+      "Hydro": 0.056,
+      "Solar": 0.5881,
+      "Wind": 0.3559
     }
   },
   "ZM": {