Skip to content

Commit

Permalink
Merge pull request #631 from Moo-Ack-Productions/dev
Browse files Browse the repository at this point in the history
Dev to main for v3.6.1.2
  • Loading branch information
TheDuckCow authored Aug 25, 2024
2 parents 1fc0a85 + a685dc1 commit 6514aa5
Show file tree
Hide file tree
Showing 9 changed files with 742 additions and 60 deletions.
9 changes: 8 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,12 @@ venv/
*.sublime-*
MCprep_addon/import_bridge/conf
MCprep_addon/import_bridge/nbt
MCprep_addon/MCprep_resources/
MCprep_addon/MCprep_resources/*.blend
MCprep_addon/MCprep_resources/mcprep_data.json
MCprep_addon/MCprep_resources/effects
MCprep_addon/MCprep_resources/resourcepacks
MCprep_addon/MCprep_resources/rigs
MCprep_addon/MCprep_resources/skins
MCprep_addon/MCprep_resources/textures
!MCprep_addon/MCprep_resources/Languages/*
MCprep_addon/.vscode
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ msgstr ""
"Language-Team: LANGUAGE <[email protected]>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"

#: MCprep_addon/mcprep_ui.py:98
Expand Down
4 changes: 2 additions & 2 deletions MCprep_addon/MCprep_resources/Languages/mcprep.pot
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#
msgid ""
msgstr ""
"Project-Id-Version: 3.6.1\n"
"Project-Id-Version: 3.6.1.1\n"
"Report-Msgid-Bugs-To: https://github.com/Moo-Ack-Productions/MCprep/issues\n"
"POT-Creation-Date: 2024-08-22 21:18-0700\n"
"POT-Creation-Date: 2024-08-24 22:58-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down
Loading

0 comments on commit 6514aa5

Please sign in to comment.