Merge branch 'wip' into testing

ExpCore/ranking.lua

@@ -216,19 +216,29 @@ end
 -- @param rtn any value you want to return
 function Ranking._rank:print(rtn,colour)
     local colour = colour or defines.color.white
+    local meta_data = Ranking._presets().meta
+    local default = Ranking.get_rank(meta_data.default)
     if not Server or not Server._thread then
         for _,player in pairs(self:get_players()) do
-            player_return(rtn,colour,player)
+            if thread.data.rank.name == thread.data.default then
+                player_return({'ranking.all-rank-print',rtn},colour,player)
+            else
+                player_return({'ranking.rank-print',self.name,rtn},colour,player)
+            end
         end
     else
         -- using threads to make less lag
         Server.new_thread{
-            data={rank=self,rtn=rtn}
+            data={rank=self,rtn=rtn,default=default.name}
         }:on_event('resolve',function(thread)
             return thread.data.rank:get_players(true)
         end):on_event('success',function(thread,players)
             for _,player in pairs(players) do
-                player_return(thread.data.rtn,colour,player)
+                if thread.data.rank.name == thread.data.default then
+                    player_return({'ranking.all-rank-print',thread.data.rtn},colour,player)
+                else
+                    player_return({'ranking.rank-print',thread.data.rank.name,thread.data.rtn},colour,player)
+                end
             end
         end):queue()
     end

locale/en/exp-core.cfg

@@ -1,6 +1,4 @@
 [commands]
-no-help=No Help Given
-help-format= __1__ __2__
 unauthorized=401 - Unauthorized: Access is denied due to invalid credentials
 invalid-inputs=Invalid Input, /__1__ __2__
 invalid-player=Invaild Player Name, __1__ ,try using tab key to auto-complete the name
@@ -8,6 +6,7 @@ command-ran=Command Complete
 
 [ranking]
 all-rank-print=[Everyone]: __1__
+rank-print=[__1__]: __2__
 rank-up=__1__ was promoted to __2__ by __3__
 rank-down=__1__ was demoted to __2__ by __3__
 rank-given=You have been given the __1__ Rank!