Upstream/Challenges
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/Challenges.git synced 2024-12-29 04:18:05 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
BuildTools 2019-08-26 09:09:10 +03:00
commit 12dd740959
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PULL_REQUEST_TEMPLATE.md
View File

@ -1,5 +1,5 @@
Thanks for submitting a pull request. Do not use this form for bug reports!
Your submission must meet the minimum requirements of a contribution, i.e., add code, refactor code or fix code.
It takes time and effort to review submissions, so please do not waste our time.
Note: formating/spacing-only submissions will be rejected!
Note: formatting/spacing-only submissions will be rejected!
For submissions, we want you to use spaces, not tabs (4 spaces) - thank you.

2
src/main/java/world/bentobox/challenges/commands/admin/CompleteCommand.java
View File

@ -85,7 +85,7 @@ public class CompleteCommand extends CompositeCommand
}
else
{
this.addon.logError("Unknonw player name " + args.get(0));
this.addon.logError("Unknown player name " + args.get(0));
}
return false;

2
src/main/java/world/bentobox/challenges/commands/admin/ResetCommand.java
View File

@ -83,7 +83,7 @@ public class ResetCommand extends CompositeCommand
}
else
{
this.addon.logError("Unknonw player name " + args.get(0));
this.addon.logError("Unknown player name " + args.get(0));
}
return false;

2
src/main/java/world/bentobox/challenges/panel/admin/ListUsersGUI.java
View File

@ -157,7 +157,7 @@ public class ListUsersGUI extends CommonGUI
index++;
}
// Add button that allows to toogle different player lists.
// Add button that allows to toggle different player lists.
panelBuilder.item( 4, this.createToggleButton());
// Navigation buttons only if necessary

18
src/main/resources/default.json
View File

@ -273,7 +273,7 @@
"friendlyName": "Cobble Stone Exchange",
"deployed": true,
"description": [
"Exchange cobble to some useful materials"
"Exchange cobble stone to some useful materials"
],
"icon": "is:\n ==: org.bukkit.inventory.ItemStack\n v: 1631\n type: COBBLESTONE\n",
"order": 1,
@ -1398,7 +1398,7 @@
"takeMoney": false,
"requiredIslandLevel": 0,
"searchRadius": 20,
"rewardText": "Some diaond and elytra for your efforts.",
"rewardText": "Some diamonds and elytra for your efforts.",
"rewardItems": [
"is:\n ==: org.bukkit.inventory.ItemStack\n v: 1631\n type: DIAMOND_ORE\n amount: 16\n",
"is:\n ==: org.bukkit.inventory.ItemStack\n v: 1631\n type: ELYTRA\n"
@ -2245,7 +2245,7 @@
},
{
"uniqueId": "competent",
"friendlyName": "Compenent Island",
"friendlyName": "Competent Island",
"deployed": true,
"description": [
"Reach 20th level of island."
@ -2431,7 +2431,7 @@
"friendlyName": "Hostile Zoo",
"deployed": true,
"description": [
"Create hostime mob zoo"
"Create hostile mob zoo"
],
"icon": "is:\n ==: org.bukkit.inventory.ItemStack\n v: 1631\n type: IRON_BARS\n",
"order": 6,
@ -2486,8 +2486,8 @@
"repeatRewardCommands": []
},
{
"uniqueId": "cheff",
"friendlyName": "Cheff",
"uniqueId": "chef",
"friendlyName": "Chef",
"deployed": true,
"description": [
"Show your ability to cook all types of food"
@ -2551,7 +2551,7 @@
"friendlyName": "Zoo Maker",
"deployed": true,
"description": [
"Create a peacefull mob zoo"
"Create a peaceful mob zoo"
],
"icon": "is:\n ==: org.bukkit.inventory.ItemStack\n v: 1631\n type: GLASS_PANE\n",
"order": 7,
@ -2787,8 +2787,8 @@
"world": "",
"order": 2,
"waiverAmount": 2,
"unlockMessage": "Congratulations - you unlocked the &dComponent level!",
"rewardText": "Small reward for completing all Component challenges.",
"unlockMessage": "Congratulations - you unlocked the &dCompetent level!",
"rewardText": "Small reward for completing all Competent challenges.",
"rewardItems": [
"is:\n ==: org.bukkit.inventory.ItemStack\n v: 1631\n type: DIRT\n amount: 16\n"
],