Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/1.20.1/dev' into Da…
Browse files Browse the repository at this point in the history
…udeuf/1.20.1/dev

# Conflicts:
#	common/src/main/java/dev/ithundxr/createnumismatics/content/backend/Coin.java
#	common/src/main/java/dev/ithundxr/createnumismatics/content/vendor/VendorBlockEntity.java
  • Loading branch information
IThundxr committed Jul 21, 2024
2 parents 41ef6d0 + 699ec32 commit d069d60
Show file tree
Hide file tree
Showing 152 changed files with 5,638 additions and 358 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// 1.20.1 2024-07-03T10:53:15.138751138 Create: Numismatics/Numismatics' Advancements
8f32fb49ef81058e2e660fac983dbef2f554db38 data/numismatics/advancements/root.json
// 1.20.1 2024-07-21T07:28:28.810770107 Create: Numismatics/Numismatics' Advancements
4ab84595dc44460d6d89ff3608940dd8694b93d6 data/numismatics/advancements/is_this_legal.json
645c92e6e449889ed4cf617432fd6fa87ffe355b data/numismatics/advancements/questionable_investment.json
8f32fb49ef81058e2e660fac983dbef2f554db38 data/numismatics/advancements/root.json
894790d980b33b5cc24a21937c7db72bf0af1c5a data/numismatics/advancements/money_laundering.json
4ab84595dc44460d6d89ff3608940dd8694b93d6 data/numismatics/advancements/is_this_legal.json

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1 +1 @@
// 1.20.1 2024-07-03T10:53:15.138642657 Create: Numismatics/Numismatics' Sequenced Assembly Recipes
// 1.20.1 2024-07-21T07:28:28.810455961 Create: Numismatics/Numismatics' Sequenced Assembly Recipes

Large diffs are not rendered by default.

56 changes: 54 additions & 2 deletions common/src/generated/resources/assets/numismatics/lang/en_ud.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,34 +33,66 @@
"block.numismatics.vendor.tooltip.summary": "˙ʇı ǝɹnbıɟuoɔ oʇ ‾ʞɔıןɔ ʇɟıɥs‾ ɹo 'ǝpɐɹʇ oʇ ‾ʞɔıןɔ ʇɥbıᴚ‾ ˙sdoɥs ǝpɐɯ ɹǝʎɐןd ɥbnoɹɥʇ sɯǝʇı ɟo buıpɐɹʇ ǝɥʇ ɹoɟ sʍoןןⱯ",
"block.numismatics.vendor.tooltip.trade_item": "ǝpɐɹ⟘ oʇ ɯǝʇI",
"command.numismatics.arguments.enum.invalid": "%s :ǝɹɐ sǝnןɐʌ pıןɐΛ ˙,%s, ǝnןɐʌ ɯnuǝ pıןɐʌuI :ɹoɹɹƎ",
"error.numismatics.authorized_card.account_not_found": "punoɟ ʇou ʇunoɔɔⱯ qnS",
"error.numismatics.authorized_card.limit_reached": "pǝɥɔɐǝɹ ʇıɯıן buıpuǝdS",
"error.numismatics.card.account_not_found": "punoɟ ʇou ʇunoɔɔⱯ",
"error.numismatics.card.not_authorized": "pǝzıɹoɥʇnɐ ʇoN",
"error.numismatics.card.not_bound": "punoq ʇou pɹɐƆ",
"gui.numismatics.bank_terminal.balance": "¤%s '%s %s :ǝɔuɐןɐᗺ",
"gui.numismatics.bank_terminal.sub_accounts": "sʇunoɔɔⱯ qnS",
"gui.numismatics.bank_terminal.sub_accounts.authorization_type": "ǝdʎ⟘ uoıʇɐzıɹoɥʇnⱯ",
"gui.numismatics.bank_terminal.sub_accounts.edit": "ʇunoɔɔⱯ qnS ʇıpƎ",
"gui.numismatics.bank_terminal.sub_accounts.help": "sʇunoɔɔⱯ qnS oN",
"gui.numismatics.bank_terminal.sub_accounts.help.line.1": "ppɐ ǝɥʇ ʞɔıןɔ uǝɥʇ puɐ ǝɯɐu ɐ ɹǝʇuƎ",
"gui.numismatics.bank_terminal.sub_accounts.help.line.2": "˙ʇunoɔɔⱯ qnS ʍǝu ɐ ǝʇɐǝɹɔ oʇ uoʇʇnq",
"gui.numismatics.bank_terminal.sub_accounts.help.line.3": "ǝpıʌoɹd oʇ pǝsn ǝq uɐɔ sʇunoɔɔⱯ qnS",
"gui.numismatics.bank_terminal.sub_accounts.help.line.4": "ɹo sɹǝʎɐןd pǝʇɔǝןǝs oʇ ssǝɔɔɐ pǝʇıɯıן",
"gui.numismatics.bank_terminal.sub_accounts.help.line.5": "˙suoıʇɔɐsuɐɹʇ pǝʇɐɯoʇnɐ ɹǝɟɐs ǝןqɐuǝ",
"gui.numismatics.bank_terminal.sub_accounts.help.line.6": "",
"gui.numismatics.bank_terminal.sub_accounts.name_box": "ǝɯɐN",
"gui.numismatics.bank_terminal.sub_accounts.named": "sʇunoɔɔⱯ qnS :%s",
"gui.numismatics.bank_terminal.sub_accounts.remove": "ʇunoɔɔⱯ qnS ǝʌoɯǝᴚ",
"gui.numismatics.bank_terminal.sub_accounts.remove.confirm": "ǝʌoɯǝɹ ʎןןɐnʇɔɐ oʇ uıɐbɐ ʞɔıןƆ ¿ǝɹns noʎ ǝɹⱯ",
"gui.numismatics.bank_terminal.sub_accounts.reset_spending": "buıpuǝdS ʇǝsǝᴚ",
"gui.numismatics.limit": "%s ɟo %s ʇuǝdS",
"gui.numismatics.limit.monetary": "¤%s '%s %s ɟo ¤%s '%s %s ʇuǝdS",
"gui.numismatics.limit.none": "ʇıɯıן oN",
"gui.numismatics.trust_list": "ʇsıꞀ ʇsnɹ⟘",
"gui.numismatics.vendor.count": ")x%s( ",
"gui.numismatics.vendor.full": "ןןnɟ sı ɹopuǝΛ",
"gui.numismatics.vendor.full.named": "ʇı ʎʇdɯǝ oʇ %s ʇɔɐʇuoɔ 'ןןnɟ sı ɹopuǝΛ",
"gui.numismatics.vendor.generic_named": "%s ʇɔɐʇuoƆ",
"gui.numismatics.vendor.incorrect_item": "ɯǝʇı ʇɔǝɹɹoɔuI",
"gui.numismatics.vendor.insufficient_funds": "spunɟ ʇuǝıɔıɟɟnsuI",
"gui.numismatics.vendor.insufficient_funds.named": "ןןıɟǝɹ ɐ ɹoɟ %s ʇɔɐʇuoɔ 'spunɟ ʇuǝıɔıɟɟnsuI",
"gui.numismatics.vendor.mode.buy": "ʎnᗺ",
"gui.numismatics.vendor.mode.buy.action": "ʎnᗺ oʇ ǝs∩",
"gui.numismatics.vendor.mode.sell": "ןןǝS",
"gui.numismatics.vendor.mode.sell.action": "ןןǝS oʇ ǝs∩",
"gui.numismatics.vendor.no_item_in_hand": "ןןǝs oʇ ʇuɐʍ noʎ sɯǝʇı ɟo ʞɔɐʇs ǝɥʇ pןoH",
"gui.numismatics.vendor.out_of_stock": "ʞɔoʇs ɟo ʇnO",
"gui.numismatics.vendor.out_of_stock.funds": "spunɟ ʇuǝıɔıɟɟnsuı sɐɥ ɹopuǝΛ",
"gui.numismatics.vendor.out_of_stock.funds.named": "ןןıɟǝɹ ɐ ɹoɟ %s ʇɔɐʇuoɔ 'spunɟ ʇuǝıɔıɟɟnsuı sɐɥ ɹopuǝΛ",
"gui.numismatics.vendor.out_of_stock.named": "ןןıɟǝɹ ɐ ɹoɟ %s ʇɔɐʇuoɔ 'ʞɔoʇs ɟo ʇnO",
"gui.numismatics.vendor.too_few_items": "sɯǝʇı ʍǝɟ oo⟘",
"item.numismatics.authorized_bank_card.tooltip": "ᗡᴚⱯƆ ʞNⱯᗺ ᗡƎZIᴚOH⟘∩Ɐ",
"item.numismatics.authorized_bank_card.tooltip.summary": "˙ʇunoɔɔɐ punoq ǝɥʇ oʇ ɯǝɥʇ ppɐ puɐ suıoɔ ǝɥʇ ʇɔǝןןoɔ ʎןןɐɔıʇɐɯoʇnɐ oʇ ‾ɹoʇısodǝᗡ/ɹopuǝΛ‾ ɐ uı pǝɔɐןd ǝq uɐƆ ˙uoıʇɐɯoʇnɐ ɹo sɹǝʎɐןd pǝʇsnɹʇ oʇ ssǝɔɔɐ ʇunoɔɔⱯ ʞuɐᗺ pǝʇıɯıן buıpıʌoɹd sʍoןןⱯ ˙ɹɐǝןɔ oʇ ‾ʞɔıןɔ ʇɟıɥs‾ 'puıq oʇ ‾nuǝɯ ʇunoɔɔⱯ qnS‾ ןɐuıɯɹǝ⟘ ʞuɐᗺ uı ʇnԀ",
"item.numismatics.authorized_card.tooltip.bound.no_label": "uʍouʞu∩ :ʇunoɔɔⱯ qnS",
"item.numismatics.authorized_card.tooltip.bound.with_label": "%s :ʇunoɔɔⱯ qnS",
"item.numismatics.authorized_card.tooltip.hold_shift": "ןɐuıɯɹǝ⟘ ʞuɐᗺ ɐ uı puıᗺ ˙ɹɐǝןɔ oʇ ʞɐǝus pןoH",
"item.numismatics.bank_card.tooltip": "ᗡᴚⱯƆ ʞNⱯᗺ",
"item.numismatics.bank_card.tooltip.summary": "˙ʇunoɔɔɐ punoq ǝɥʇ oʇ ɯǝɥʇ ppɐ puɐ suıoɔ ǝɥʇ ʇɔǝןןoɔ ʎןןɐɔıʇɐɯoʇnɐ oʇ ‾ɹoʇısodǝᗡ/ɹopuǝΛ‾ ɐ uı pǝɔɐןd ǝq uɐɔ ɹo '‾ןɐuıɯɹǝ⟘ ʞuɐᗺ‾ ɐ uı pǝsn uǝɥʍ ʇunoɔɔⱯ ʞuɐᗺ punoq ǝɥʇ oʇ ssǝɔɔⱯ sʍoןןⱯ ˙ɹɐǝןɔ oʇ ‾ʞɔıןɔ ʇɟıɥs‾ 'puıq oʇ ‾ʞɔıןƆ ʇɥbıᴚ‾",
"item.numismatics.bank_card.tooltip.summary": "˙ʇunoɔɔɐ punoq ǝɥʇ oʇ ɯǝɥʇ ppɐ puɐ suıoɔ ǝɥʇ ʇɔǝןןoɔ ʎןןɐɔıʇɐɯoʇnɐ oʇ ‾ɹoʇısodǝᗡ/ɹopuǝΛ‾ ɐ uı pǝɔɐןd ǝq uɐɔ ɹo '‾ןɐuıɯɹǝ⟘ ʞuɐᗺ‾ ɐ uı pǝsn uǝɥʍ ʇunoɔɔⱯ ʞuɐᗺ punoq ǝɥʇ oʇ ssǝɔɔɐ sʍoןןⱯ ˙ɹɐǝןɔ oʇ ‾ʞɔıןɔ ʇɟıɥs‾ 'puıq oʇ ‾ʞɔıןƆ ʇɥbıᴚ‾",
"item.numismatics.banking_guide": "ǝpın⅁ buıʞuɐᗺ",
"item.numismatics.banking_guide.tooltip": "ƎᗡI∩⅁ ⅁NIʞNⱯᗺ",
"item.numismatics.banking_guide.tooltip.summary": "˙‾ɹǝʞuɐᗺ ǝzɐןᗺ‾ ɐ oʇuı ʇı ʇɹǝʌuoɔ oʇ ‾ɹǝuɹnᗺ ǝzɐןᗺ‾ ɐ uo ǝs∩",
"item.numismatics.bevel": "ןǝʌǝᗺ",
"item.numismatics.bevel.plural": "sןǝʌǝᗺ",
"item.numismatics.black_authorized_card": "pɹɐƆ pǝzıɹoɥʇnⱯ ʞɔɐןᗺ",
"item.numismatics.black_card": "pɹɐƆ ʞuɐᗺ ʞɔɐןᗺ",
"item.numismatics.black_id_card": "pɹɐƆ ᗡI ʞɔɐןᗺ",
"item.numismatics.blue_authorized_card": "pɹɐƆ pǝzıɹoɥʇnⱯ ǝnןᗺ",
"item.numismatics.blue_card": "pɹɐƆ ʞuɐᗺ ǝnןᗺ",
"item.numismatics.blue_id_card": "pɹɐƆ ᗡI ǝnןᗺ",
"item.numismatics.brown_authorized_card": "pɹɐƆ pǝzıɹoɥʇnⱯ uʍoɹᗺ",
"item.numismatics.brown_card": "pɹɐƆ ʞuɐᗺ uʍoɹᗺ",
"item.numismatics.brown_id_card": "pɹɐƆ ᗡI uʍoɹᗺ",
"item.numismatics.card.tooltip.blank": "ʞuɐןᗺ",
Expand All @@ -73,31 +105,42 @@
"item.numismatics.coin.tooltip.value.basic": "¤%s :ǝnןɐΛ",
"item.numismatics.crown": "uʍoɹƆ",
"item.numismatics.crown.plural": "suʍoɹƆ",
"item.numismatics.cyan_authorized_card": "pɹɐƆ pǝzıɹoɥʇnⱯ uɐʎƆ",
"item.numismatics.cyan_card": "pɹɐƆ ʞuɐᗺ uɐʎƆ",
"item.numismatics.cyan_id_card": "pɹɐƆ ᗡI uɐʎƆ",
"item.numismatics.gray_authorized_card": "pɹɐƆ pǝzıɹoɥʇnⱯ ʎɐɹ⅁",
"item.numismatics.gray_card": "pɹɐƆ ʞuɐᗺ ʎɐɹ⅁",
"item.numismatics.gray_id_card": "pɹɐƆ ᗡI ʎɐɹ⅁",
"item.numismatics.green_authorized_card": "pɹɐƆ pǝzıɹoɥʇnⱯ uǝǝɹ⅁",
"item.numismatics.green_card": "pɹɐƆ ʞuɐᗺ uǝǝɹ⅁",
"item.numismatics.green_id_card": "pɹɐƆ ᗡI uǝǝɹ⅁",
"item.numismatics.id_card.tooltip": "ᗡᴚⱯƆ ᗡI",
"item.numismatics.id_card.tooltip.already_bound": "puıqu∩ oʇ ǝs∩ + ʞɐǝuS 'punoq ʎpɐǝɹןⱯ",
"item.numismatics.id_card.tooltip.bound": "ɟןǝs oʇ punoᗺ",
"item.numismatics.id_card.tooltip.cleared": "pǝɹɐǝןƆ",
"item.numismatics.id_card.tooltip.summary": "˙ʞɔoןq ʇɐɥʇ oʇ ssǝɔɔɐ ɹǝʎɐןd punoq ǝɥʇ ǝʌıb oʇ sʞɔoןq sɔıʇɐɯsıɯnN ʎuɐɯ ɟo ‾nuǝW pǝʇsnɹ⟘‾ ǝɥʇ uı pǝɔɐןd ǝq uɐƆ ˙ɹɐǝןɔ oʇ ‾ʞɔıןɔ ʇɟıɥs‾ 'puıq oʇ ‾ʞɔıןƆ ʇɥbıᴚ‾",
"item.numismatics.light_blue_authorized_card": "pɹɐƆ pǝzıɹoɥʇnⱯ ǝnןᗺ ʇɥbıꞀ",
"item.numismatics.light_blue_card": "pɹɐƆ ʞuɐᗺ ǝnןᗺ ʇɥbıꞀ",
"item.numismatics.light_blue_id_card": "pɹɐƆ ᗡI ǝnןᗺ ʇɥbıꞀ",
"item.numismatics.light_gray_authorized_card": "pɹɐƆ pǝzıɹoɥʇnⱯ ʎɐɹ⅁ ʇɥbıꞀ",
"item.numismatics.light_gray_card": "pɹɐƆ ʞuɐᗺ ʎɐɹ⅁ ʇɥbıꞀ",
"item.numismatics.light_gray_id_card": "pɹɐƆ ᗡI ʎɐɹ⅁ ʇɥbıꞀ",
"item.numismatics.lime_authorized_card": "pɹɐƆ pǝzıɹoɥʇnⱯ ǝɯıꞀ",
"item.numismatics.lime_card": "pɹɐƆ ʞuɐᗺ ǝɯıꞀ",
"item.numismatics.lime_id_card": "pɹɐƆ ᗡI ǝɯıꞀ",
"item.numismatics.magenta_authorized_card": "pɹɐƆ pǝzıɹoɥʇnⱯ ɐʇuǝbɐW",
"item.numismatics.magenta_card": "pɹɐƆ ʞuɐᗺ ɐʇuǝbɐW",
"item.numismatics.magenta_id_card": "pɹɐƆ ᗡI ɐʇuǝbɐW",
"item.numismatics.orange_authorized_card": "pɹɐƆ pǝzıɹoɥʇnⱯ ǝbuɐɹO",
"item.numismatics.orange_card": "pɹɐƆ ʞuɐᗺ ǝbuɐɹO",
"item.numismatics.orange_id_card": "pɹɐƆ ᗡI ǝbuɐɹO",
"item.numismatics.pink_authorized_card": "pɹɐƆ pǝzıɹoɥʇnⱯ ʞuıԀ",
"item.numismatics.pink_card": "pɹɐƆ ʞuɐᗺ ʞuıԀ",
"item.numismatics.pink_id_card": "pɹɐƆ ᗡI ʞuıԀ",
"item.numismatics.purple_authorized_card": "pɹɐƆ pǝzıɹoɥʇnⱯ ǝןdɹnԀ",
"item.numismatics.purple_card": "pɹɐƆ ʞuɐᗺ ǝןdɹnԀ",
"item.numismatics.purple_id_card": "pɹɐƆ ᗡI ǝןdɹnԀ",
"item.numismatics.red_authorized_card": "pɹɐƆ pǝzıɹoɥʇnⱯ pǝᴚ",
"item.numismatics.red_card": "pɹɐƆ ʞuɐᗺ pǝᴚ",
"item.numismatics.red_id_card": "pɹɐƆ ᗡI pǝᴚ",
"item.numismatics.sprocket": "ʇǝʞɔoɹdS",
Expand All @@ -106,11 +149,20 @@
"item.numismatics.spur.plural": "sɹndS",
"item.numismatics.sun": "unS",
"item.numismatics.sun.plural": "sunS",
"item.numismatics.white_authorized_card": "pɹɐƆ pǝzıɹoɥʇnⱯ ǝʇıɥM",
"item.numismatics.white_card": "pɹɐƆ ʞuɐᗺ ǝʇıɥM",
"item.numismatics.white_id_card": "pɹɐƆ ᗡI ǝʇıɥM",
"item.numismatics.yellow_authorized_card": "pɹɐƆ pǝzıɹoɥʇnⱯ ʍoןןǝʎ",
"item.numismatics.yellow_card": "pɹɐƆ ʞuɐᗺ ʍoןןǝʎ",
"item.numismatics.yellow_id_card": "pɹɐƆ ᗡI ʍoןןǝʎ",
"itemGroup.numismatics": "sɔıʇɐɯsıɯnN :ǝʇɐǝɹƆ",
"numismatics.andesite_depositor.price": "ǝɔıɹԀ",
"numismatics.authorization_type.anybody": "ʎpoqʎuⱯ",
"numismatics.authorization_type.anybody.description": "sɹǝʇndɯoɔ ʇɟɐɹƆɹǝʇndɯoƆ sɐ ɥɔns uoıʇɐɯoʇnɐ buıpnןɔuı 'ᗡI ǝɥʇ ɥʇıʍ ʎpoqʎuⱯ",
"numismatics.authorization_type.trusted_automation": "uoıʇɐɯoʇnⱯ + sɹǝʎɐןԀ pǝʇsnɹ⟘",
"numismatics.authorization_type.trusted_automation.description": ")sɹǝʎoןdǝᗡ ˙b˙ǝ( ɯǝɥʇ ʎq pǝɔɐןd uoıʇɐɯoʇnɐ puɐ ʇsıן ʇsnɹʇ ǝɥʇ uo sɹǝʎɐןԀ",
"numismatics.authorization_type.trusted_players": "ʎןuO sɹǝʎɐןԀ pǝʇsnɹ⟘",
"numismatics.authorization_type.trusted_players.description": "ʇsıן ʇsnɹʇ ǝɥʇ uo sɹǝʎɐןd ʎןuO",
"numismatics.special.ltr": "ǝnɹʇ",
"numismatics.trust_list.configure": "ʇsıꞀ ʇsnɹ⟘ ǝɹnbıɟuoƆ"
}
Loading

0 comments on commit d069d60

Please sign in to comment.