Merge remote-tracking branch 'origin/dev' into dev

Author: lord-ruby

assets/1x/jokers.png

@@ -6259,7 +6259,7 @@ local dancer = {
     end,
     entr_credits = {
         idea = {"cassknows"},
-        art = {"candycanearter"}
+        art = {"Lil. Mr. Slipstream"}
     }
 }
 

assets/2x/jokers.png

@@ -2605,8 +2605,8 @@ local decs = {
 			c_entr_inferno = {
 				name = "Inferno",
 				text = {
-					"Destroy {C:attention}all{} Selected Cards",
-					"lost {C:money}$#1#{} for every card",
+					"Destroy {C:attention}all{} selected cards",
+					"Lose {C:money}$#1#{} for every card",
 					"past {C:attention}2{}"
 				}
 			},