Plexus-Mirror/Plex
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex.git synced 2024-11-04 19:15:36 +00:00
Code Issues Projects Releases Wiki Activity
289 commits 16 branches 12 tags 5.3 MiB
Commit graph

224 commits

Author SHA1 Message Date
Telesphoreo
9708f871c8 Merge branch 'master' of https://github.com/plexusorg/Plex 2022-04-06 23:49:50 -05:00
Telesphoreo
eaa40e7013 Attempt to fix updater 2022-04-06 23:49:45 -05:00
ayunami2000
c6aa4cf0a4 Merge branch 'master' of https://github.com/plexusorg/Plex 2022-04-07 00:41:31 -04:00
ayunami2000
72b8774731 add dispenser filter & touch up spawn egg filter 2022-04-07 00:41:29 -04:00
Telesphoreo
ca18b12164 Try this 2022-04-06 23:14:44 -05:00
Taah
ea862e152f check for update status instead of sending msg 2022-04-06 21:08:03 -07:00
ayunami2000
639365bd52 realize spawneggservice is useless 2022-04-07 00:06:18 -04:00
ayunami2000
262b600b11 Merge branch 'master' of https://github.com/plexusorg/Plex 2022-04-07 00:02:57 -04:00
ayunami2000
199832e020 add block blocker 
in the future, this will be it's own module or something
 2022-04-07 00:02:45 -04:00
Taah
1f653ab5df Add /plex update 2022-04-06 20:55:54 -07:00
Telesphoreo
5012d0478b Switch UUID in PlexPlayer to an actual UUID and fix notes 2022-04-06 22:55:01 -05:00
ayunami2000
c18eb6fedd
Merge branch 'master' into spawneggfilter 2022-04-06 22:50:02 -04:00
ayunami2000
96de4cdb1d fix!! 2022-04-06 22:46:21 -04:00
Telesphoreo
b22a36948a this isnt working 2022-04-06 21:39:45 -05:00
ayunami2000
21bef1280d fix autowiping 
so it can work with reloads
 2022-04-06 22:08:51 -04:00
Taah
34d1eafaaf reload services and add ids to notes 2022-04-06 19:05:29 -07:00
Telesphoreo
48bf9bdbe5 Merge branch 'master' of https://github.com/plexusorg/Plex 2022-04-06 21:00:33 -05:00
Telesphoreo
41e81449bd half working 2022-04-06 21:00:28 -05:00
ayunami2000
705500bddd autowipe + toggledrops 
yay!
 2022-04-06 21:48:51 -04:00
Taah
03e5833f0a add item builder class 2022-04-06 18:39:13 -07:00
Taah
f2ee3bf7a5 begin notes system 
store task id
 2022-04-06 17:38:15 -07:00
Telesphoreo
f62e0a42d1 i have no idea what im doing 2022-04-06 19:18:12 -05:00
ayunami2000
2105f51b44 comment out useless teleporting 
not necessary lol
 2022-04-06 20:16:16 -04:00
ayunami2000
fcf41fe58e add spawn egg filtering 2022-04-06 20:06:50 -04:00
Taah
1d8ce6001c add getting players by username 2022-04-06 16:59:34 -07:00
ayunami2000
0b9f9d74ba add /mp, and refine /rd to only non-mobs by default 
awesome
 2022-04-06 19:42:47 -04:00
Telesphoreo
035b579fc1 Merge branch 'master' of https://github.com/plexusorg/Plex 2022-04-06 18:01:34 -05:00
Telesphoreo
f547f10e0f Fix typo 2022-04-06 18:01:29 -05:00
ayunami2000
9eacb2287a Add /entitywipe + fix messageComponent 
lol
 2022-04-06 18:43:49 -04:00
Telesphoreo
e0632644ab Fix the updater 2022-04-05 15:46:21 -05:00
Telesphoreo
7420e7e721 Optimize imports 2022-04-05 15:40:42 -05:00
Telesphoreo
7ed0549ec6 Fixed a few bugs 2022-04-05 15:40:25 -05:00
Telesphoreo
f5a89384a0 Remove commented out things 2022-04-05 13:14:53 -05:00
Telesphoreo
08bdeaac48
Merge branch 'master' into punishments 2022-04-05 13:10:08 -05:00
Telesphoreo
8a0c354682 actually fix it this time 2022-04-04 15:22:04 -05:00
Telesphoreo
c8a64cc9cb Fix NPE in unban command 2022-04-04 15:18:20 -05:00
Taah
6f4bc5aec1 so far it is working but the only thing preventing me from going to fully asynchronous calls for punishments is httpd... 2022-04-04 01:36:50 -07:00
Taah
35d436bb61 remove <v> and swap it to {number} for messages 2022-04-03 21:07:48 -07:00
Telesphoreo
511506348f Ban service now works with JSON 2022-04-03 17:59:16 -05:00
Telesphoreo
894cda2ede Remove some of this duplicate code 2022-04-03 16:45:32 -05:00
Telesphoreo
470f652e0b Actually add IPs to punishment 2022-04-02 18:03:58 -05:00
Telesphoreo
fd9fafb6bb I'd say this is pretty important 2022-04-02 15:12:38 -05:00
Telesphoreo
aa18e5d11a Add new IPs 2022-04-02 14:55:47 -05:00
Telesphoreo
a4ce9511fd this is enough coding for one day 2022-04-02 01:25:24 -05:00
Telesphoreo
82343815dd Remove debug 2022-04-02 00:36:04 -05:00
Telesphoreo
4d0cf96b97 Revert "Let's try something" 
This reverts commit ccdefe97a3.
 2022-04-02 00:32:04 -05:00
Telesphoreo
ccdefe97a3 Let's try something 2022-04-01 23:56:56 -05:00
Telesphoreo
787458f1df Remove debugging from command loader 2022-04-01 23:21:37 -05:00
Telesphoreo
0f898380db this is why we need an API 2022-04-01 23:09:43 -05:00
Telesphoreo
c484f4b2b2 Not tested, remove automatic loading of properties 2022-04-01 23:04:51 -05:00