|
|
c46007c231
|
Merge pull request 'english' (#354) from english into master
Reviewed-on: SteamWar/BungeeCore#354
Reviewed-by: Lixfel <lixfel@steamwar.de>
|
2022-05-24 10:15:41 +02:00 |
|
|
|
f9a5a75442
|
Merge branch 'master' into english
|
2022-05-24 10:11:46 +02:00 |
|
|
|
e64e3c09ff
|
Various language fixes
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-05-24 10:11:10 +02:00 |
|
|
|
d7f0d3300f
|
Merge pull request 'Improve TpCommand for current checking players' (#356) from ImproveChecking into master
Reviewed-on: SteamWar/BungeeCore#356
Reviewed-by: Lixfel <lixfel@steamwar.de>
|
2022-05-24 09:06:39 +02:00 |
|
|
|
cfd72d099d
|
Fix NPE
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-05-24 09:03:31 +02:00 |
|
yoyosource
|
d5c6c7892e
|
Improve TpCommand for current checking players
|
2022-05-23 17:56:15 +02:00 |
|
yoyosource
|
4f6bb722ad
|
Fix stuff
|
2022-05-21 16:30:41 +02:00 |
|
yoyosource
|
5a129c6037
|
Fix SteamwarUser
|
2022-05-21 13:25:07 +02:00 |
|
yoyosource
|
8aed828f82
|
Add SettingsChangedListener
|
2022-05-21 13:04:30 +02:00 |
|
yoyosource
|
1204a5ccda
|
Update translations
|
2022-05-21 12:54:59 +02:00 |
|
yoyosource
|
df310716d8
|
Update language stuff
|
2022-05-21 12:48:03 +02:00 |
|
yoyosource
|
0dc49a3123
|
Merge remote-tracking branch 'origin/english' into english
|
2022-05-21 12:31:33 +02:00 |
|
yoyosource
|
9445ed5f05
|
Fix initial english
|
2022-05-21 12:31:26 +02:00 |
|
yoyosource
|
2098cc9515
|
Add initial english
|
2022-05-21 12:31:26 +02:00 |
|
yoyosource
|
b95ae4cecc
|
Add initial english
|
2022-05-21 12:31:26 +02:00 |
|
yoyosource
|
081a0a2e3a
|
Add initial english
|
2022-05-21 12:31:26 +02:00 |
|
yoyosource
|
fdbab764d3
|
Add initial english
|
2022-05-21 12:31:26 +02:00 |
|
yoyosource
|
1847ba8f89
|
Fix command
|
2022-05-21 11:09:01 +02:00 |
|
yoyosource
|
df24f2685a
|
Add locale locking
|
2022-05-21 11:06:24 +02:00 |
|
yoyosource
|
092efd7063
|
Add locale locking
|
2022-05-21 11:00:08 +02:00 |
|
yoyosource
|
019852b552
|
Fix initial english
|
2022-05-20 22:41:51 +02:00 |
|
yoyosource
|
081165f223
|
Add initial english
|
2022-05-20 16:15:14 +02:00 |
|
yoyosource
|
3cb14844f3
|
Add initial english
|
2022-05-20 16:15:02 +02:00 |
|
yoyosource
|
0793a7fd44
|
Add initial english
|
2022-05-19 22:26:28 +02:00 |
|
yoyosource
|
9491f948b5
|
Add initial english
|
2022-05-19 22:26:16 +02:00 |
|
|
|
2203b99d3e
|
Merge pull request 'Fix ban message showing' (#353) from fixBan into master
Reviewed-on: SteamWar/BungeeCore#353
Reviewed-by: YoyoNow <jwsteam@nidido.de>
|
2022-05-18 17:01:25 +02:00 |
|
|
|
348aabc99a
|
Fix ban message showing
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-05-18 16:47:38 +02:00 |
|
yoyosource
|
1dedebb3aa
|
Fix BungeeCore.properties
|
2022-05-02 13:58:45 +02:00 |
|
|
|
0a5c89b8b7
|
Merge pull request 'Arena Merging 2.0' (#329) from arena_merging_2.0 into master
Reviewed-on: SteamWar/BungeeCore#329
Reviewed-by: Lixfel <lixfel@steamwar.de>
|
2022-05-01 22:45:03 +02:00 |
|
|
|
cd15787ae1
|
Merge pull request 'Add some new punishments after talking with mods' (#352) from Punishment++ into master
Reviewed-on: SteamWar/BungeeCore#352
Reviewed-by: Lixfel <lixfel@steamwar.de>
|
2022-05-01 22:20:01 +02:00 |
|
yoyosource
|
d1e90d8a6c
|
Speed BrandListener up
|
2022-04-27 10:08:54 +02:00 |
|
yoyosource
|
d4a50d3974
|
Speed BrandListener up
|
2022-04-27 10:06:44 +02:00 |
|
yoyosource
|
07da2c56a3
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/de/steamwar/bungeecore/listeners/BrandListener.java
|
2022-04-27 09:59:21 +02:00 |
|
yoyosource
|
6e158b38b8
|
Speed BrandListener up
|
2022-04-27 09:58:15 +02:00 |
|
|
|
d6c82e923f
|
Speed BrandListener up
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-04-26 19:58:41 +02:00 |
|
yoyosource
|
93dcb0d202
|
Revert "Update stuff"
This reverts commit f61fcde5c9.
|
2022-04-26 19:25:32 +02:00 |
|
yoyosource
|
aaf389ea4c
|
Merge remote-tracking branch 'origin/Punishment++' into Punishment++
|
2022-04-26 18:18:34 +02:00 |
|
yoyosource
|
f61fcde5c9
|
Update stuff
|
2022-04-26 18:18:27 +02:00 |
|
|
|
d0bbdd903b
|
Merge branch 'master' into Punishment++
|
2022-04-26 15:26:00 +02:00 |
|
yoyosource
|
9a28173496
|
Update stuff
|
2022-04-26 15:21:44 +02:00 |
|
yoyosource
|
cc86aa16a0
|
Update stuff
|
2022-04-26 15:21:09 +02:00 |
|
|
|
34757566d3
|
Merge pull request 'Update to Https' (#351) from submodule_patch into master
Reviewed-on: SteamWar/BungeeCore#351
Reviewed-by: Lixfel <lixfel@steamwar.de>
|
2022-04-25 21:38:38 +02:00 |
|
yoyosource
|
2ef6901f8e
|
Update WhoisCommand
Add mutlie note punishments
|
2022-04-25 11:09:08 +02:00 |
|
|
|
50ac0ddc55
|
Speed Brandlistener up
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-04-24 17:54:06 +02:00 |
|
yoyosource
|
f52444f6e5
|
Add some new punishments after talking with mods
|
2022-04-24 15:02:03 +02:00 |
|
|
|
f30b779347
|
Fix BrandListener performance
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-04-24 08:29:21 +02:00 |
|
Chaoscaot
|
95b8fa1b29
|
🐛 Update to Https
|
2022-04-23 12:29:01 +02:00 |
|
Chaoscaot
|
7191531045
|
Merge remote-tracking branch 'origin/master' into arena_merging_2.0
# Conflicts:
# src/de/steamwar/bungeecore/commands/FightCommand.java
|
2022-04-23 12:19:41 +02:00 |
|
|
|
f2df750894
|
Merge pull request 'Teamserver' (#344) from Teamserver into master
Reviewed-on: SteamWar/BungeeCore#344
Reviewed-by: Lixfel <lixfel@steamwar.de>
|
2022-04-23 12:17:04 +02:00 |
|
yoyosource
|
cd5bc889a6
|
Fix pr stuff
|
2022-04-23 11:01:13 +02:00 |
|
