Merge branch 'development'

.gitlab-ci.yml

@@ -4,7 +4,7 @@ stages:
 variables:
   name: "EpicFarming"
   path: "/builds/$CI_PROJECT_PATH"
-  version: "3.0.6"
+  version: "3.0.7"
 
 build:
   stage: build

src/main/resources/en_US.lang

@@ -1,46 +1,58 @@
-#General Messages
+# General Messages
 
-general.nametag.prefix = "&8[&6EpicFarming&8]"
-general.nametag.farm = "&eLevel %level% &fFarm"
-general.nametag.lore = ""
-general.interface.next = "Next"
-general.interface.previous = "Previous"
-general.interface.unlocked = "Unlocked"
-general.interface.on = "On"
-general.interface.off = "Off"
-general.interface.both = "Both"
-general.interface.crops = "Crops"
-general.interface.livestock = "Livestock"
+general:
+  nametag:
+    prefix: '&8[&6EpicFarming&8]'
+    farm: '&eLevel %level% &fFarm'
+    lore: ''
+  interface:
+    next: Next
+    previous: Previous
+    unlocked: Unlocked
+    'on': 'On'
+    'off': 'Off'
+    both: Both
+    crops: Crops
+    livestock: Livestock
 
-#Interface Messages
+# Interface Messages
 
-interface.button.upgradewithxp = "&aUpgrade with XP"
-interface.button.upgradewithxplore = "&7Cost: &a%cost% Levels"
-interface.button.upgradewitheconomy = "&aUpgrade with ECO"
-interface.button.upgradewitheconomylore = "&7Cost: &a$%cost%"
-interface.button.level = "&6Next Level &7%level%"
-interface.button.radius = "&7Radius: &6%radius%"
-interface.button.speed = "&7Speed: &6%speed%x"
-interface.button.autocollect =  "&7Auto Collect: &6%status%"
-interface.button.autoreplant = "&7Auto Replant: &6%status%"
-interface.button.autobreeding = "&7Auto Breeding: &6%status%"
-interface.button.autobutcher = "&7Auto Butcher: &6%status%"
-interface.button.pages = "&7Pages: &6%amount%"
-interface.button.boostedstats = "&a&lCurrently boosted!|&7Yield rate multiplied by &6%amount%x&7.|&7Expires in &6%time%&7."
-interface.button.farmtype = "&7Farm type: &6%type%"
-interface.button.farmtypelore = "&7Click to switch your farm type."
-interface.button.functiontoggle = "&7Click to toggle this function."
+interface:
+  button:
+    upgradewithxp: '&aUpgrade with XP'
+    upgradewithxplore: '&7Cost: &a%cost% Levels'
+    upgradewitheconomy: '&aUpgrade with ECO'
+    upgradewitheconomylore: '&7Cost: &a$%cost%'
+    level: '&6Next Level &7%level%'
+    radius: '&7Radius: &6%radius%'
+    speed: '&7Speed: &6%speed%x'
+    autocollect: '&7Auto Collect: &6%status%'
+    autoreplant: '&7Auto Replant: &6%status%'
+    autobreeding: '&7Auto Breeding: &6%status%'
+    autobutcher: '&7Auto Butcher: &6%status%'
+    pages: '&7Pages: &6%amount%'
+    boostedstats: '&a&lCurrently boosted!|&7Yield rate multiplied by &6%amount%x&7.|&7Expires in &6%time%&7.'
+    farmtype: '&7Farm type: &6%type%'
+    farmtypelore: '&7Click to switch your farm type.'
+    functiontoggle: '&7Click to toggle this function.'
 
-#Command Messages
+# Command Messages
 
-command.give.success = "&7You have been given a &6level %level% &7farm item."
+command:
+  give:
+    success: '&7You have been given a &6level %level% &7farm item.'
 
-#Event Messages
+# Event Messages
 
-event.general.nopermission = "&cYou do not have permission to do that."
-event.upgrade.cannotafford = "&cYou cannot afford this upgrade."
-event.upgrade.success = "&7You successfully upgraded this farm to &6level %level%&7!"
-event.upgrade.maxed = "&6This farm is maxed out."
-event.upgrade.successmaxed = "&7You maxed out this farm at &6%level%x&7."
-event.limit.hit = "&7You can only have &6%limit% &7farms at a single time."
-event.warning.noauto = "&6Warning: &cThis item does not get farmed automatically"
+event:
+  general:
+    nopermission: '&cYou do not have permission to do that.'
+  upgrade:
+    cannotafford: '&cYou cannot afford this upgrade.'
+    success: '&7You successfully upgraded this farm to &6level %level%&7!'
+    maxed: '&6This farm is maxed out.'
+    successmaxed: '&7You maxed out this farm at &6%level%x&7.'
+  limit:
+    hit: '&7You can only have &6%limit% &7farms at a single time.'
+  warning:
+    noauto: '&6Warning: &cThis item does not get farmed automatically'