Commit Graph

2437 Commits

Author SHA1 Message Date
jiahua.liu
49673262ad Merge remote-tracking branch 'origin/master'
# Conflicts:
#	mirai-console/src/main/kotlin/net/mamoe/mirai/console/MiraiConsole.kt
2020-02-18 15:01:53 +08:00
Him188
680f452cae Fix ambiguous function name 2020-02-18 15:01:35 +08:00
jiahua.liu
83d4375de3 to merge 2020-02-18 15:01:19 +08:00
Him188
08bdf82125 Fix inappropriate blocking method call 2020-02-18 15:00:32 +08:00
Him188
a85c8cac05 Merge remote-tracking branch 'origin/master' 2020-02-18 14:59:23 +08:00
Him188
bd568a7c7f Suspend console 2020-02-18 14:59:03 +08:00
Him188
1bfd69b162
Update README.MD 2020-02-18 14:42:57 +08:00
Him188
4108e58e75 Update README 2020-02-18 14:40:52 +08:00
Him188
1565d4b799 Update README 2020-02-18 14:28:28 +08:00
Him188
866a5ac6c8 F**k kotlin compiler 2020-02-18 13:45:21 +08:00
Him188
c4a18321bb Merge remote-tracking branch 'origin/master' 2020-02-18 13:38:32 +08:00
Him188
757bedc657 Suppress EXTENSION_SHADOWED_BY_MEMBER 2020-02-18 13:38:11 +08:00
Him188
79ea74bf9a Update CHANGELOG 2020-02-18 13:36:03 +08:00
Him188
fc4fb4f297 Retry fetch group on fail 2020-02-18 13:35:28 +08:00
Him188
2b4d9a8e79 Add tryNTimes 2020-02-18 13:35:14 +08:00
Him188
4bec7d753b Make java user happier 2020-02-18 13:18:30 +08:00
Him188
29091e817f Fix gradle dependency 2020-02-18 13:03:51 +08:00
Him188
96ace8f0f8 0.15.2 2020-02-18 13:03:27 +08:00
Him188
413ab294c7 Update jfx version 2020-02-18 12:58:58 +08:00
jiahua.liu
3844ef3311 Merge remote-tracking branch 'origin/master' 2020-02-18 12:33:21 +08:00
jiahua.liu
885288d110 mriai console pure bug-fixed 2020-02-18 12:33:08 +08:00
Him188
cc821d0b4a Fix tips 2020-02-18 12:10:38 +08:00
Him188
cb50a337e0 Load resources 2020-02-18 11:46:10 +08:00
Him188
2e70218c1a Set jfx properly 2020-02-18 11:45:57 +08:00
Him188
6601f9a06c Revert workflow main.yml 2020-02-18 11:45:29 +08:00
ryoii
7ff9906bca f*ck JFoenix 2020-02-18 01:24:14 +08:00
ryoii
db13a867cf Merge remote-tracking branch 'origin/master' 2020-02-17 23:10:59 +08:00
ryoii
8985c20c0c f*ck JFoenix 2020-02-17 23:10:14 +08:00
Him188
9710e34d82 Merge remote-tracking branch 'origin/master' 2020-02-17 18:36:41 +08:00
Him188
efa404d0d3 Try fix compilation bug 2020-02-17 18:36:08 +08:00
ryoii
24eaa15c0d graphical console import jfoenix UI 2020-02-17 18:30:58 +08:00
jiahua.liu
a034f561d9 terminal console closable 2020-02-17 18:20:48 +08:00
jiahua.liu
3ebe6cea61 terminal console closable 2020-02-17 18:19:50 +08:00
jiahua.liu
ef8b9ed861 terminal console closable 2020-02-17 18:18:28 +08:00
jiahua.liu
425cab9bbc terminal console closable 2020-02-17 18:17:48 +08:00
jiahua.liu
07734e2cc3 terminal console closable 2020-02-17 18:16:33 +08:00
jiahua.liu
9f4dfa7e43 terminal console closable 2020-02-17 18:16:15 +08:00
jiahua.liu
52c2f7a4bb terminal console closable 2020-02-17 18:15:38 +08:00
jiahua.liu
a16e775efa terminal console closable 2020-02-17 18:06:36 +08:00
jiahua.liu
c009d49331 terminal console closable 2020-02-17 18:06:15 +08:00
jiahua.liu
dbe650a10e terminal console closable 2020-02-17 18:05:50 +08:00
jiahua.liu
4d58edeed3 terminal console closable 2020-02-17 18:05:33 +08:00
jiahua.liu
208ee9aee2 terminal console closable 2020-02-17 18:04:48 +08:00
jiahua.liu
5ecfe93a68 terminal console closable 2020-02-17 18:02:25 +08:00
jiahua.liu
5bb85a2d01 terminal console closable 2020-02-17 18:01:47 +08:00
jiahua.liu
261306f6b0 terminal console closable 2020-02-17 18:01:37 +08:00
jiahua.liu
ed64866d16 terminal console closable 2020-02-17 17:38:36 +08:00
jiahua.liu
924fa65f6a terminal console closable 2020-02-17 17:36:22 +08:00
jiahua.liu
7357c65e72 Terminal Console quitable 2020-02-17 17:15:39 +08:00
jiahua.liu
01b05ee93b mirai console shutdown logic 2020-02-17 17:04:17 +08:00