3.0.0 (#6)

---------

Co-authored-by: cajun <12363371+CajunAvenger@users.noreply.github.com>

data/ch-s.mse-locale/locale

@@ -591,7 +591,7 @@ label:
 	installer size:						尺寸
 	installer status:					地位
 	no version:							-
-
+	put space between cards:			Put space between cards?
 ############################################################## Buttons/checkboxes/choices in the GUI
 button:
 	# Editor
@@ -713,6 +713,7 @@ title:
 	custom pack:						定制包装类型
 	# print
 	print preview:						打印预览
+	settings:							Settings
 	# export
 	export images:						导出为图像
 	export cancelled:					导出取消

data/ch-t.mse-locale/locale

@@ -590,7 +590,7 @@ label:
 	installer size:						尺寸
 	installer status:					地位
 	no version:							-
-
+	put space between cards:			Put space between cards?
 ############################################################## Buttons/checkboxes/choices in the GUI
 button:
 	# Editor
@@ -712,6 +712,7 @@ title:
 	custom pack:						客製化包裝類型
 	# print
 	print preview:						打印預覽
+	settings:							Settings
 	# export
 	export images:						導出為圖像
 	export cancelled:					導出取消

data/da.mse-locale/locale

@@ -591,7 +591,7 @@ label:
 	installer size:						Størrelse:
 	installer status:					Status:
 	no version:							-
-
+	put space between cards:			Put space between cards?
 ############################################################## Buttons/checkboxes/choices in the GUI
 button:
 	# Editor
@@ -715,6 +715,7 @@ title:
 	custom pack:						Egen Pakketype
 	# print
 	print preview:						Udskriftsvisning
+	settings:							Settings
 	# export
 	export images:						Eksportér Billeder
 	export cancelled:					Eksport Afbrudt

data/de.mse-locale/locale

@@ -589,6 +589,7 @@ label:
 	installer size:						Größe
 	installer status:					Status:
 	no version:							-
+	put space between cards:			Put space between cards?
 
 ############################################################## Buttons/checkboxes/choices in the GUI
 button:
@@ -713,6 +714,7 @@ title:
 	custom pack:						Benutzerdefinierter Pakettyp
 	# print
 	print preview:						Druckvorschau
+	settings:							Settings
 	# export
 	export images:						Bild exportieren
 	export cancelled:					Export abgebrochen

data/en.mse-locale/locale

@@ -591,6 +591,8 @@ label:
 	installer status:					Status:
 	no version:							-
 
+	put space between cards:			Put space between cards?
+
 ############################################################## Buttons/checkboxes/choices in the GUI
 button:
 	# Editor
@@ -714,6 +716,7 @@ title:
 	custom pack:						Custom Pack Type
 	# print
 	print preview:						Print Preview
+	settings:							Settings
 	# export
 	export images:						Export Images
 	export cancelled:					Export Cancelled
@@ -944,30 +947,38 @@ package:
 	magic-mana-*.mse-symbol-font:
 		# note: reminder/shortcut must start with a space, otherwise it is used as a shortcut
 		#       so typing T *anywhere* would insert a symbol (which would be bad)
-		menu item T:			&Tap symbol	 T
-		menu item Q:			&Untap symbol	 Q
-		menu item W:			&White mana	 W
-		menu item U:			Bl&ue mana	 U
-		menu item B:			&Black mana	 B
-		menu item R:			&Red mana	 R
-		menu item G:			&Green mana	 G
-		menu item S:			&Snow mana	 S
-		menu item X:			Variable mana &X	 X
-		menu item Y:			Variable mana &Y	 Y
-		menu item Z:			Variable mana &Z	 Z
-		menu item I:			&Infinite mana	I
-		menu item colorless:	&Colorless mana...
-		title colorless:		Colorless mana
-		message colorless:		Enter amount of colorless mana:
+		menu item T:				&Tap	 T
+		menu item Q:				&Untap	 Q
+		menu item E:				&Energy	 E
+		menu item J:				Pawprint	 J
+		menu item TK:				Ticket	 TK
+		menu item A:				Chaos	 A
+		menu item W:				&White mana	 W
+		menu item U:				Bl&ue mana	 U
+		menu item B:				&Black mana	 B
+		menu item R:				&Red mana	 R
+		menu item G:				&Green mana	 G
+		menu item C:				&Colorless mana	 C
+		menu item S:				&Snow mana	 S
+		menu item X:				Variable mana &X	 X
+		menu item Y:				Variable mana &Y	 Y
+		menu item Z:				Variable mana &Z	 Z
+		menu item ∞:				&Infinite mana	 ∞
+		menu item colorless:		&Generic mana...
+		title colorless:			Generic mana
+		message colorless:			Enter amount of generic mana:
 		menu item half:				&Half mana
-		menu item |W:				&White	 |W
-		menu item |U:				Bl&ue	 |U
-		menu item |B:				&Black	 |B
-		menu item |R:				&Red	 |R
-		menu item |G:				&Green	 |G
-		menu item |S:				&Snow	 |S
-		menu item 1/2:				&Colorless	1/2
-		menu item hybrid:		H&ybrid mana (two color)
+		menu item half mana:		&Half mana
+		menu item |W:				Half &White mana	 |W
+		menu item |U:				Half Bl&ue mana	 |U
+		menu item |B:				Half &Black mana	 |B
+		menu item |R:				Half &Red mana	 |R
+		menu item |G:				Half &Green mana	 |G
+		menu item |C:				Half &Colorless mana	 |C
+		menu item |S:				Half &Snow mana	 |S
+		menu item 1/2:				Half &Generic mana	 1/2
+		menu item |1:				Half &Generic mana	 |1
+		menu item hybrid:			H&ybrid mana (two colors)
 		menu item W/U:				White/Blue mana	 W/U
 		menu item U/B:				Blue/Black mana	 U/B
 		menu item B/R:				Black/Red mana	 B/R
@@ -978,7 +989,13 @@ package:
 		menu item B/G:				Black/Green mana	 B/G
 		menu item R/W:				Red/White mana	 R/W
 		menu item G/U:				Green/Blue mana	 G/U
-		menu item hybrid 3:		H&ybrid mana (three color)
+		menu item C/W:				Colorless/White mana	 C/W
+		menu item C/U:				Colorless/Blue mana	 C/U
+		menu item C/B:				Colorless/Black mana	 C/B
+		menu item C/R:				Colorless/Red mana	 C/R
+		menu item C/G:				Colorless/Green mana	 C/G
+		menu item hybrid 3:			Hybrid mana (three colors)
+		menu item tri-hybrid mana:	Hybrid mana (three colors)
 		menu item W/U/B:			White/Blue/Black mana	 W/U/B
 		menu item U/B/R:			Blue/Black/Red mana	 U/B/R
 		menu item B/R/G:			Black/Red/Green mana	 B/R/G
@@ -989,3 +1006,80 @@ package:
 		menu item B/G/W:			Black/Green/White mana	 B/G/W
 		menu item R/W/U:			Red/White/Blue mana	 R/W/U
 		menu item G/U/B:			Green/Blue/Black mana	 G/U/B
+		menu item W/U/B/R/G:		Prismatic (five colors)	 W/U/B/R/G
+		menu item H:				Phyrexian Generic mana	 H
+		menu item H/W:				Phyrexian White mana	 H/W
+		menu item H/U:				Phyrexian Blue mana	 H/U
+		menu item H/B:				Phyrexian Black mana	 H/B
+		menu item H/R:				Phyrexian Red mana	 H/R
+		menu item H/G:				Phyrexian Green mana	 H/G
+		menu item H/W/U:			Phyrexian White/Blue mana	 H/W/U
+		menu item H/W/B:			Phyrexian White/Black mana	 H/W/B
+		menu item H/U/B:			Phyrexian Blue/Black mana	 H/U/B
+		menu item H/U/R:			Phyrexian Blue/Red mana	 H/U/R
+		menu item H/B/R:			Phyrexian Black/Red mana	 H/B/R
+		menu item H/B/G:			Phyrexian Black/Green mana	 H/B/G
+		menu item H/R/G:			Phyrexian Red/Green mana	 H/R/G
+		menu item H/R/W:			Phyrexian Red/White mana	 H/R/W
+		menu item H/G/W:			Phyrexian Green/White mana	 H/G/W
+		menu item H/G/U:			Phyrexian Green/Blue mana	 H/G/U
+		menu item number hybrids:	Number Hybrid
+		menu item 2/W:				2 Generic/White mana	 2/W
+		menu item 2/U:				2 Generic/Blue mana	 2/U
+		menu item 2/B:				2 Generic/Black mana	 2/B
+		menu item 2/R:				2 Generic/Red mana	 2/R
+		menu item 2/G:				2 Generic/Green mana	 2/G
+		menu item 2/C:				2 Generic/Colorless mana	 2/C
+		menu item 2/S:				2 Generic/Snow mana	 2/S
+		menu item D0:				0 Defense	 D0
+		menu item D1:				1 Defense	 D1
+		menu item D2:				2 Defense	 D2
+		menu item D3:				3 Defense	 D3
+		menu item D4:				4 Defense	 D4
+		menu item D5:				5 Defense	 D5
+		menu item D6:				6 Defense	 D6
+		menu item D7:				7 Defense	 D7
+		menu item D8:				8 Defense	 D8
+		menu item D9:				9 Defense	 D9
+		menu item DX:				X Defense	 DX
+		menu item r1:				Chapter 1	 r1
+		menu item r2:				Chapter 2	 r2
+		menu item r3:				Chapter 3	 r3
+		menu item r4:				Chapter 4	 r4
+		menu item r5:				Chapter 5	 r5
+		menu item r6:				Chapter 6	 r6
+		menu item +10:				Add 10 Loyalty	 +10
+		menu item +1:				Add 1 Loyalty	 +1
+		menu item +2:				Add 2 Loyalty	 +2
+		menu item +3:				Add 3 Loyalty	 +3
+		menu item +4:				Add 4 Loyalty	 +4
+		menu item +5:				Add 5 Loyalty	 +5
+		menu item +6:				Add 6 Loyalty	 +6
+		menu item +7:				Add 7 Loyalty	 +7
+		menu item +8:				Add 8 Loyalty	 +8
+		menu item +9:				Add 9 Loyalty	 +9
+		menu item +X:				Add X Loyalty	 +X
+		menu item -10:				Remove 10 Loyalty	 -10
+		menu item -1:				Remove 1 Loyalty	 -1
+		menu item -2:				Remove 2 Loyalty	 -2
+		menu item -3:				Remove 3 Loyalty	 -3
+		menu item -4:				Remove 4 Loyalty	 -4
+		menu item -5:				Remove 5 Loyalty	 -5
+		menu item -6:				Remove 6 Loyalty	 -6
+		menu item -7:				Remove 7 Loyalty	 -7
+		menu item -8:				Remove 8 Loyalty	 -8
+		menu item -9:				Remove 9 Loyalty	 -9
+		menu item -X:				Remove X Loyalty	 -X
+		menu item =10:				Set to 10 Loyalty	 =10
+		menu item =0:				Set to 0 Loyalty	 =0
+		menu item =1:				Set to 1 Loyalty	 =1
+		menu item =2:				Set to 2 Loyalty	 =2
+		menu item =3:				Set to 3 Loyalty	 =3
+		menu item =4:				Set to 4 Loyalty	 =4
+		menu item =5:				Set to 5 Loyalty	 =5
+		menu item =6:				Set to 6 Loyalty	 =6
+		menu item =7:				Set to 7 Loyalty	 =7
+		menu item =8:				Set to 8 Loyalty	 =8
+		menu item =9:				Set to 9 Loyalty	 =9
+		menu item =X:				Set to X Loyalty	 =X
+		

data/es.mse-locale/locale

@@ -592,6 +592,7 @@ label:
 	installer size:						Tamaño:
 	installer status:					Estado:
 	no version:							-
+	put space between cards:			Put space between cards?
 
 ############################################################## Buttons/checkboxes/choices in the GUI
 button:
@@ -716,6 +717,7 @@ title:
 	custom pack:						Mazo personalizado
 	# print
 	print preview:						Vista previa de impresión
+	settings:							Settings
 	# export
 	export images:						Exportar imágenes
 	export cancelled:					Exportación cancelada

data/fr.mse-locale/locale

@@ -591,6 +591,7 @@ label:
 	installer size:						Taille:
 	installer status:					État:
 	no version:							-
+	put space between cards:			Put space between cards?
 
 ############################################################## Buttons/checkboxes/choices in the GUI
 button:
@@ -715,6 +716,7 @@ title:
 	custom pack:						Type de pack personnalisé
 	# print
 	print preview:						Aperçu de l'impression
+	settings:							Settings
 	# export
 	export images:						Exporter images
 	export cancelled:					Export annulé

data/it.mse-locale/locale

@@ -590,6 +590,7 @@ label:
 	installer size:						Dimesioni:
 	installer status:					Stato:
 	no version:							-
+	put space between cards:			Put space between cards?
 
 ############################################################## Buttons/checkboxes/choices in the GUI
 button:
@@ -714,6 +715,7 @@ title:
 	custom pack:						Tipo Busta personalizzata
 	# print
 	print preview:						Anteprima di stampa
+	settings:							Settings
 	# export
 	export images:						Esporta immagini
 	export cancelled:					Esportazione cancellata

data/jp.mse-locale/locale

@@ -589,6 +589,7 @@ label:
 	installer size:						サイズ
 	installer status:					状態
 	no version:							-
+	put space between cards:			Put space between cards?
 
 ############################################################## Buttons/checkboxes/choices in the GUI
 button:
@@ -711,6 +712,7 @@ title:
 	custom pack:						カスタムパックタイプ
 	# print
 	print preview:						印刷プレビュー
+	settings:							Settings
 	# export
 	export images:						画像のエクスポート
 	export cancelled:					エクスポートの取り消し

data/ko.mse-locale/locale

@@ -591,6 +591,7 @@ label:
 	installer size:						크기:
 	installer status:					상태:
 	no version:							-
+	put space between cards:			Put space between cards?
 
 ############################################################## Buttons/checkboxes/choices in the GUI
 button:
@@ -716,6 +717,7 @@ title:
 	custom pack:						맞춤형 팩 유형
 	# print
 	print preview:						인쇄 &미리보기
+	settings:							Settings
 	# export
 	export images:						모든 카드 이미지 내보내기
 	export cancelled:					내보내기가 취소되었습니다.

data/magic-DayNight.mse-style/style

@@ -6,7 +6,7 @@ icon: card-sample.png
 installer group: magic/m15 style/leveler cards
 position hint: 034
 
-version: 2018-02-09
+version: 2024-05-30
 depends on:
 	package: magic.mse-game
 	version: 2014-06-25
@@ -14,11 +14,8 @@ depends on:
 	package: magic-default-image.mse-include
 	version: 2007-09-23
 depends on:
-	package: magic-watermarks.mse-include
-	version: 2007-09-23
-depends on:
-	package: magic-identity-new.mse-include
-	version: 2012-01-22
+	package: magic-modules.mse-include
+	version: 2024-10-01
 depends on:
 	package: magic-mana-large.mse-symbol-font
 	version: 2007-09-23
@@ -40,7 +37,7 @@ init script:
 	#Should multicolor lands with basic land types have a colored name?
 	mask_multi_land_with_color := { styling.colored_multicolor_land_name }
 	
-	template_prefix := [card: "" card2: "" pt: "" stamp: "" identity: "/magic-identity-new.mse-include/"]
+	template_prefix := [card: "" card2: "" pt: "" stamp: "" identity: "/magic-modules.mse-include/indicators/"]
 	template_suffix := [card: "card.jpg" card2: "card2.jpg" pt: "pt.png" stamp: "stamp.jpg" identity: "identity.png"]
 	template      := { template_prefix[type] + input + template_suffix[type] }
 	land_template := { template_prefix[type] + (if input == "a" then "c" else input) + "l" + template_suffix[type] }
@@ -71,7 +68,7 @@ init script:
 		replace@(
 			match: "<atom-cardname><nospellcheck>CARDNAME</nospellcheck></atom-cardname>"
 			replace: "<atom-cardname><nospellcheck>" + (if card.name=="" then "CARDNAME" else card.name) + "</nospellcheck></atom-cardname>")
-	has_identity := { styling.color_indicator_dot }
+	watermark_include := "/magic-modules.mse-include/watermarks"
 	is_unsorted := {styling.remove_from_autocount}
 ############################################################## Set info fields
 set info style:
@@ -107,15 +104,6 @@ styling field:
 	type: text
 	name: level fontsize bottom
 	description: Controls the level box font size.
-styling field:
-	type: boolean
-	name: use holofoil stamps
-	description: Change to no to disable rare holofoil stamps
-styling field:
-	type: boolean
-	name: color indicator dot
-	description: Use the color indicator dot
-	initial: no
 styling field:
 	type: boolean
 	name: remove from autocount
@@ -193,6 +181,10 @@ styling style:
 			no:  { symbol_variation(symbol: set.symbol, variation: "common") }
 			yes: { symbol_variation(symbol: set.symbol, variation: "invertedcommon") }
 ############################################################## Card fields
+include file: /magic-modules.mse-include/corners/card_fields
+include file: /magic-modules.mse-include/information/card_fields
+include file: /magic-modules.mse-include/stamps/card_fields
+include file: /magic-modules.mse-include/card-symbols/card_fields
 card style:
 	############################# Background stuff
 	card color:
@@ -233,15 +225,6 @@ card style:
 		always symbol: true
 		z index: 2
 		padding top: 0
-	card symbol:
-		left: {if card.card_symbol=="none" then 20 else 30}
-		top: 29
-		height: 20
-		width: 14
-		z index: 1
-		render style: image
-		choice images:
-			tombstone: tombstone.png
 	############################# Image
 	image:
 		left: 29
@@ -259,7 +242,7 @@ card style:
 		z index: 1
 		render style: image
 		visible: { has_identity() }
-		image: { card_identity() }
+		image: { module_identity() }
 	type:
 		left: { if has_identity() then "52" else "32" }
 		top: {298 + shrink_type() }
@@ -281,21 +264,7 @@ card style:
 		z index: 2
 		render style: image
 		alignment: middle right
-		choice images:
-			# Images based on the set symbol
-			basic land:
-				script:
-					if styling.inverted_common_symbol then symbol_variation(symbol: set.symbol, variation: "invertedcommon")
-					else symbol_variation(symbol: set.symbol, variation: "common")
-			common:
-				script:
-					if styling.inverted_common_symbol then symbol_variation(symbol: set.symbol, variation: "invertedcommon")
-					else symbol_variation(symbol: set.symbol, variation: "common")
-			uncommon:   script: symbol_variation(symbol: set.symbol, variation: "uncommon")
-			rare:       script: symbol_variation(symbol: set.symbol, variation: "rare")
-			mythic rare:       script: symbol_variation(symbol: set.symbol, variation: "mythic rare")
-			special:    script: symbol_variation(symbol: set.symbol, variation: "special")
-			masterpiece: script: symbol_variation(symbol: set.masterpiece_symbol, variation: "mythic rare")
+		include file: /magic-modules.mse-include/rarities/choice_images
 	############################# Text box
 	rule text:
 		left: 29
@@ -329,15 +298,15 @@ card style:
 		line height hard max: 1.3
 		line height line max: 1.6
 	watermark:
-		left: 117
-		top: 321
-		width: 138
-		height: 166
+		left: 21
+		top: 328
+		width: 331
+		height: 142
 		z index: 1
 		render style: image
-		popup style: in place
 		alignment: middle center
-		include file: /magic-watermarks.mse-include/watermarks
+		include file:	/magic.mse-game/watermarks/menu_choice_images
+		image:			{ watermark_image_1() }
 	############################# Levels
 	level 1:
 		z index: 3
@@ -404,58 +373,7 @@ card style:
 			size: 16
 			color: white
 			separator color: red
-	############################# Card sorting / numbering
-	set code:
-		left: 24
-		top: 498
-		width: 40
-		height: 10
-		z index: 1
-		font:
-			name: Relay-Medium
-			size: 7
-			color: white
-			weight: bold
-	############################# Copyright stuff
-	illustrator:
-		left: { 44 + card_style.set_code.content_width }
-		top: 497.5
-		width: 200
-		height: 10
-		z index: 1
-		font:
-			name: Beleren Small Caps Bold
-			size: 7.25
-			color: white
-	copyright:
-		right: 350
-		top: 488
-		width: 140
-		height: 10
-		z index: 2
-		visible: {not set.automatic_copyright}
-		alignment: middle right shrink-overflow
-		font:
-			name: Matrix
-			size: 7
-			color: white
-			weight: bold
 ############################################################## Extra card fields
-extra card field:
-	type: text
-	name: card code
-	save value: false
-	script:
-		if set.automatic_card_numbers and not styling.remove_from_autocount then
-			forward_editor(prefix: card_number_m15() + "/" + card_count_m15() + " " + rarity_code() + " ", field: card.card_code_text)
-		else
-			combined_editor(field1: card.custom_card_number, separator: " " + rarity_code() + " ", field2: card.card_code_text)
-extra card field:
-	type: choice
-	name: artist arrow
-	editable: false
-	save value: false
-	choice: white
 extra card field:
 	type: choice
 	name: pt box
@@ -480,12 +398,6 @@ extra card field:
 	script: card.card_color
 	editable: false
 	save value: false
-extra card field:
-	type: choice
-	name: foil stamp
-	choice: stamp
-	save value: false
-	editable: false
 extra card field:
 	type: choice
 	name: foil layer
@@ -579,33 +491,7 @@ extra card field:
 	script:
 		combined_editor(field1: card.rule_text_3, separator: "<line>\n</line>", field2: card.flavor_text)
 	description: The third rules text box and flavor text for the card; use up and down arrows to switch
-extra card field:
-	type: text
-	name: auto copyright
-	script: set.copyright
-	save value: false
-	editable: false
-	show statistics: false
 extra card style:
-	card code:
-		left: 24
-		top: 488
-		width: 120
-		height: 10
-		z index: 1
-		font:
-			name: Relay-Medium
-			size: 7
-			color: white
-			weight: bold
-	artist arrow:
-		left: { 28 + card_style.set_code.content_width }
-		top: 500
-		width: 12
-		height: 7
-		z index: 1
-		render style: image
-		image: artist_arrow.png
 	pt box:
 		left: 280
 		top: 338.5
@@ -634,29 +520,20 @@ extra card style:
 		render style: image
 		image: {combine_blend(image1: leveler_ptbox3(), image2: "ptbox_multiply_2.png", combine: "multiply")}
 	stamp:
-		left: 165
-		top: 472
-		width: 46
+		left: 159
+		top: 471
+		width: 56
 		height: 26
 		z index: 1
-		visible: { is_rare() and styling.use_holofoil_stamps }
+		visible: { card.card_stamp != "none" }
 		render style: image
-		image: astamp.png
-	foil stamp:
-		left: 165
-		top: 472
-		width: 46
-		height: 26
-		z index: 1
-		visible: { is_rare() and styling.use_holofoil_stamps }
-		render style: image
-		image: foil_stamp.png
+		image: { if stamp_shape() == "triangle" then module_ubstamp() else module_stamp() }
 	foil layer:
 		left: 0
 		top : 0
 		width: 375
 		height: 523
-		z index: 3
+		z index: 1050
 		render style: image
 		image: {if styling.overlay == "" then nil else styling.overlay + "/overlay.png"}
 		mask: { if is_rare() then "foil_mask_rare.png" else "foil_mask.png" }
@@ -851,16 +728,3 @@ extra card style:
 		line height soft: 0.9
 		line height hard max: 1.3
 		line height line max: 1.6
-	auto copyright:
-		right: 350
-		top: 488
-		width: 140
-		height: 10
-		z index: 2
-		alignment: middle right shrink-overflow
-		visible: {set.automatic_copyright}
-		font:
-			name: Matrix
-			size: 7
-			color: white
-			weight: bold