Merge branch 'main' into frozen-jokers

manifest.json

@@ -6,7 +6,7 @@
     "author": [
         "Emik"
     ],
-    "version": "2.1.3",
+    "version": "2.1.4",
     "badge_colour": "8BE9FD",
     "main_file": "src/main.lua",
     "badge_text_colour": "44475A",

src/edition.lua

@@ -74,7 +74,6 @@ end
 SMODS.Edition {
     key = "frozen",
     shader = "frozen",
-    pools = {Joker = true},
     sound = {sound = "Roland_frozen", per = 1, vol = 0.8},
     weight = 8,
     extra_cost = 4,

src/joker.lua

@@ -326,6 +326,7 @@ joker {
 joker {
     key = "domino",
     pronouns = "it_its",
+    artist = "char",
     config = {extra = {mult_gain = 4, hand_name = "Four of a Kind", mult = 0}},
     cost = 4,
     rarity = 2,
@@ -355,6 +356,7 @@ joker {
 joker {
     key = "trimino",
     pronouns = "it_its",
+    artist = "char",
     config = {extra = {times = 4, hand_name = "Four of a Kind"}},
     cost = 8,
     rarity = 3,