Chaoscaot
|
49cfb11bf1
|
Fix Merge Conflicts and Force Shutdown
SteamWarCI Build successful
|
2023-02-23 10:51:37 +01:00 |
|
Chaoscaot
|
56227a4a9f
|
Merge remote-tracking branch 'origin/master' into dc_5.0
# Conflicts:
# src/de/steamwar/bungeecore/bot/AuthManager.java
# src/de/steamwar/bungeecore/bot/commands/BanCommand.java
# src/de/steamwar/bungeecore/bot/commands/MuteCommand.java
# src/de/steamwar/bungeecore/bot/commands/UnbanCommand.java
# src/de/steamwar/bungeecore/bot/listeners/DiscordAuthListener.java
# src/de/steamwar/bungeecore/bot/listeners/DiscordEventListener.java
|
2023-02-23 10:50:10 +01:00 |
|
|
c0822b726b
|
Merge pull request 'NoFabricFabric' (#460) from NoFabricFabric into master
SteamWarCI Build successful
Reviewed-on: #460
Reviewed-by: Lixfel <lixfel@steamwar.de>
|
2023-02-23 10:21:31 +01:00 |
|
yoyosource
|
0d6e1f54bd
|
Update check
SteamWarCI Build successful
|
2023-02-23 08:35:43 +01:00 |
|
|
e2e2366759
|
Merge pull request 'CommonDB' (#463) from commonDB2 into master
SteamWarCI Build successful
Reviewed-on: #463
Reviewed-by: YoyoNow <jwsteam@nidido.de>
|
2023-02-23 08:09:24 +01:00 |
|
|
06432868cc
|
Update to CommonCore master
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2023-02-23 08:07:29 +01:00 |
|
yoyosource
|
242e19adb2
|
Hotfix TeamCommand tp and join
SteamWarCI Build successful
|
2023-02-22 20:07:06 +01:00 |
|
yoyosource
|
b096f8251c
|
Hotfix TeamCommand info
SteamWarCI Build successful
|
2023-02-22 16:51:45 +01:00 |
|
|
99750ca767
|
Fix Bugs
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2023-02-22 16:18:16 +01:00 |
|
yoyosource
|
6e30c5e7ba
|
Hotfix TeamCommand info
SteamWarCI Build successful
|
2023-02-22 15:15:55 +01:00 |
|
|
5c9394e4b0
|
Merge branch 'master' into commonDB2
SteamWarCI Build successful
# Conflicts:
# src/de/steamwar/bungeecore/commands/BasicCommand.java
# src/de/steamwar/bungeecore/commands/EventCommand.java
# src/de/steamwar/bungeecore/commands/JoinmeCommand.java
# src/de/steamwar/bungeecore/commands/TeamCommand.java
# src/de/steamwar/bungeecore/commands/TeamchatCommand.java
|
2023-02-22 07:12:23 +01:00 |
|
|
3136c2f6d9
|
Merge pull request 'port_to_commandframework' (#457) from port_to_commandframework into master
SteamWarCI Build successful
Reviewed-on: #457
Reviewed-by: Lixfel <lixfel@steamwar.de>
|
2023-02-22 07:10:32 +01:00 |
|
yoyosource
|
02c8538d76
|
Fix another some weird tab completes
SteamWarCI Build successful
|
2023-02-21 20:49:38 +01:00 |
|
yoyosource
|
ba064a1f9e
|
Fix another one
SteamWarCI Build successful
|
2023-02-21 20:45:00 +01:00 |
|
yoyosource
|
87db98a310
|
Fix 3 things
SteamWarCI Build successful
|
2023-02-21 20:38:19 +01:00 |
|
|
734de7178b
|
Es ist vollbracht
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2023-02-21 20:03:36 +01:00 |
|
|
c4bafb4591
|
WIP CommonDB: Milestone SWUser
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2023-02-21 18:22:42 +01:00 |
|
Chaoscaot
|
40e61f7000
|
Port Discord Bot to JDA 5.0
SteamWarCI Build successful
|
2023-02-21 17:16:27 +01:00 |
|
|
4d535c5550
|
Merge branch 'master' into commonDB2
# Conflicts:
# CommonCore
|
2023-02-21 15:58:18 +01:00 |
|
|
8a20d41f95
|
Hotfix LoginResult
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2023-02-20 17:05:44 +01:00 |
|
|
978fd1abe0
|
Fix Quilt FabricModSender requirement
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2023-02-19 22:46:58 +01:00 |
|
|
79a5e711c8
|
Merge branch 'master' into NoFabricFabric
SteamWarCI Build successful
|
2023-02-18 15:57:42 +01:00 |
|
yoyosource
|
0dd50c7e09
|
Update timings
SteamWarCI Build successful
|
2023-02-18 12:54:34 +01:00 |
|
yoyosource
|
05b6b3ac66
|
Add even better fabric check
SteamWarCI Build successful
|
2023-02-18 12:49:24 +01:00 |
|
yoyosource
|
42c23e4521
|
Add exception log
SteamWarCI Build successful
|
2023-02-18 11:04:29 +01:00 |
|
|
6735bf4d6a
|
Merge pull request 'Add NonFabricFabricCheck' (#458) from NoFabricFabric into master
SteamWarCI Build successful
Reviewed-on: #458
Reviewed-by: Lixfel <lixfel@steamwar.de>
|
2023-02-17 17:42:25 +01:00 |
|
yoyosource
|
68a2f78e04
|
Update messages
SteamWarCI Build successful
|
2023-02-17 17:33:56 +01:00 |
|
yoyosource
|
5d70cc4185
|
Update messages
SteamWarCI Build successful
|
2023-02-17 17:25:58 +01:00 |
|
yoyosource
|
91e73eab25
|
Update messages
SteamWarCI Build successful
|
2023-02-17 17:24:49 +01:00 |
|
yoyosource
|
e4ab48a386
|
Fix vanilla brand check
SteamWarCI Build successful
|
2023-02-17 17:22:49 +01:00 |
|
yoyosource
|
277304b7f2
|
Fix vanilla brand check
SteamWarCI Build successful
|
2023-02-17 17:15:30 +01:00 |
|
yoyosource
|
bc44380c32
|
Add NonFabricFabricCheck
SteamWarCI Build successful
|
2023-02-17 17:13:46 +01:00 |
|
|
a0dd4f5c57
|
HotFix Tablistpart
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2023-02-17 17:09:05 +01:00 |
|
yoyosource
|
9dd3cb7697
|
Update JoinmeCommand ProxiedPlayer Validator
SteamWarCI Build successful
Fix typos in TeamCommand
|
2023-02-17 15:27:20 +01:00 |
|
yoyosource
|
dd8d65ff9d
|
Merge remote-tracking branch 'origin/port_to_commandframework' into port_to_commandframework
SteamWarCI Build successful
|
2023-02-17 15:22:09 +01:00 |
|
yoyosource
|
6de8ed282b
|
Add usage messsage on no permission
|
2023-02-17 15:22:05 +01:00 |
|
|
dfcb754a83
|
Merge branch 'master' into port_to_commandframework
SteamWarCI Build successful
|
2023-02-17 15:16:51 +01:00 |
|
yoyosource
|
b3a4c93c59
|
Update stuff
SteamWarCI Build successful
|
2023-02-17 15:08:55 +01:00 |
|
|
e26ee5f389
|
Merge pull request 'Improve needed mods check' (#456) from BetterNeededMods into master
SteamWarCI Build successful
Reviewed-on: #456
Reviewed-by: Lixfel <lixfel@steamwar.de>
|
2023-02-17 14:58:29 +01:00 |
|
yoyosource
|
f524cb61dc
|
Final fixes
|
2023-02-17 14:57:23 +01:00 |
|
yoyosource
|
3f9f9546f6
|
Improve needed mods check
SteamWarCI Build successful
|
2023-02-17 14:51:03 +01:00 |
|
|
8581d9e102
|
Merge branch 'master' into commonDB2
# Conflicts:
# CommonCore
# src/de/steamwar/bungeecore/commands/CheckCommand.java
|
2023-02-17 12:14:39 +01:00 |
|
|
27c241f2d4
|
Fix CheckCommand schematic deleted
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2023-02-17 11:54:20 +01:00 |
|
|
be6538c78d
|
WIP CommonDB
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2023-02-17 11:47:58 +01:00 |
|
|
6e2546a596
|
Merge pull request 'ModCommand' (#445) from ModCommand into master
SteamWarCI Build successful
Reviewed-on: #445
Reviewed-by: Lixfel <lixfel@steamwar.de>
|
2023-02-14 09:13:45 +01:00 |
|
|
01322548ef
|
Merge branch 'master' into ModCommand
SteamWarCI Build successful
|
2023-02-12 20:34:26 +01:00 |
|
|
52b180468a
|
Merge pull request 'Fix Logging of Upload schem to fix the whole thing' (#455) from schem_upload_logging into master
SteamWarCI Build successful
Reviewed-on: #455
Reviewed-by: Lixfel <lixfel@steamwar.de>
|
2023-02-08 22:39:52 +01:00 |
|
|
b0eedf3944
|
Merge branch 'master' into ModCommand
SteamWarCI Build successful
|
2023-02-06 17:19:28 +01:00 |
|
zOnlyKroks
|
e3f84c0b4d
|
Fix license header
SteamWarCI Build successful
|
2023-02-06 17:19:10 +01:00 |
|
Chaoscaot
|
a40ad699f5
|
Fix Logging of Upload schem to fix the whole thing
SteamWarCI Build successful
|
2023-02-05 23:42:35 +01:00 |
|