Anvilcraft/Create
1
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-12-16 13:43:43 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.16/dev

Browse source
This commit is contained in:
Bob Dole 2020-10-19 23:39:23 -04:00
commit 7690834343
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/main/resources/assets/create/lang/default/messages.json
View file

@ -302,10 +302,10 @@
"create.schematicannon.status.schematicNotPlaced": "Schematic Not Deployed", "create.schematicannon.status.schematicNotPlaced": "Schematic Not Deployed",
"create.schematicannon.status.schematicExpired": "Schematic File Expired", "create.schematicannon.status.schematicExpired": "Schematic File Expired",
"create.gui.filter.blacklist": "Blacklist", "create.gui.filter.blacklist": "Deny-List",
"create.gui.filter.blacklist.description": "Items pass if they do NOT match any of the above. An empty Blacklist accepts everything.", "create.gui.filter.blacklist.description": "Items pass if they do NOT match any of the above. An empty Deny-List accepts everything.",
"create.gui.filter.whitelist": "Whitelist", "create.gui.filter.whitelist": "Allow-List",
"create.gui.filter.whitelist.description": "Items pass if they match any of the above. An empty Whitelist rejects everything.", "create.gui.filter.whitelist.description": "Items pass if they match any of the above. An empty Allow-List rejects everything.",
"create.gui.filter.respect_data": "Respect Data", "create.gui.filter.respect_data": "Respect Data",
"create.gui.filter.respect_data.description": "Items only match if their durability, enchantments, and other attributes match as well.", "create.gui.filter.respect_data.description": "Items only match if their durability, enchantments, and other attributes match as well.",
"create.gui.filter.ignore_data": "Ignore Data", "create.gui.filter.ignore_data": "Ignore Data",
@ -348,11 +348,11 @@
"create.gui.attribute_filter.selected_attributes": "Selected attributes:", "create.gui.attribute_filter.selected_attributes": "Selected attributes:",
"create.gui.attribute_filter.add_attribute": "Add attribute to List", "create.gui.attribute_filter.add_attribute": "Add attribute to List",
"create.gui.attribute_filter.add_inverted_attribute": "Add opposite attribute to List", "create.gui.attribute_filter.add_inverted_attribute": "Add opposite attribute to List",
"create.gui.attribute_filter.whitelist_disjunctive": "Whitelist (Any)", "create.gui.attribute_filter.whitelist_disjunctive": "Allow-List (Any)",
"create.gui.attribute_filter.whitelist_disjunctive.description": "Items pass if they have any of the selected attributes.", "create.gui.attribute_filter.whitelist_disjunctive.description": "Items pass if they have any of the selected attributes.",
"create.gui.attribute_filter.whitelist_conjunctive": "Whitelist (All)", "create.gui.attribute_filter.whitelist_conjunctive": "Allow-List (All)",
"create.gui.attribute_filter.whitelist_conjunctive.description": "Items pass only if they have ALL of the selected attributes.", "create.gui.attribute_filter.whitelist_conjunctive.description": "Items pass only if they have ALL of the selected attributes.",
"create.gui.attribute_filter.blacklist": "Blacklist", "create.gui.attribute_filter.blacklist": "Deny-List",
"create.gui.attribute_filter.blacklist.description": "Items pass if they do NOT have any of the selected attributes.", "create.gui.attribute_filter.blacklist.description": "Items pass if they do NOT have any of the selected attributes.",
"create.gui.attribute_filter.add_reference_item": "Add Reference Item", "create.gui.attribute_filter.add_reference_item": "Add Reference Item",

BIN
src/main/resources/assets/create/textures/gui/icons.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 8.4 KiB