CivMC/Civ
1
0
Fork 0
mirror of https://github.com/CivMC/Civ.git synced 2026-07-18 00:20:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
691 Commits 31 Branches 181 Tags
e13f0c9a6ad7cc38b1b81a4dfd4baeb25c19f2fc
Commit Graph

691 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
wingzero54
e13f0c9a6a Disable merge command 2021-03-13 09:06:06 -06:00
Maxopoly
df11cd891d Fix distr. management 2021-01-01 04:50:38 +01:00
Maxopoly
e7113679a4 Update repo to new github one 2021-01-01 02:15:38 +01:00
Maxopoly
eb55bd1fe1 Update to 1.16.4 2020-12-29 02:28:11 +01:00
Maxopoly
0177144887 Merge pull request #35 from Protonull/master 
MojangNames + Permission Sorting
 2020-12-27 07:43:27 +01:00
Alexander
32a061fab0 MojangNames # Fix import 2020-12-18 23:24:50 +00:00
Alexander
07b06d9e24 MojangNames # Reduce lambda obscurity 2020-12-18 21:05:29 +00:00
Alexander
356fc50a03 PermissionManageGUI # Remove Stream chain 2020-12-18 21:05:01 +00:00
Alexander
d8db732363 PermissionManagerGUI # List permissions alphabetically 2020-12-18 06:31:56 +00:00
Alexander
c59e5dbf17 Add Mojang names cache 2020-12-18 06:29:09 +00:00
Maxopoly
ce2d7bd22a Merge pull request #32 from wingzero54/patch-1 
Disables the merge option in GUI since merging is glitched
 2020-10-07 00:14:06 +02:00
wingzero54
988836398a Disables the merge option in GUI since merging is glitched 2020-09-30 23:15:32 -05:00
Maxopoly
fecc6ac7d5 Fix permscheck for old rank for nlpp 2020-09-14 03:46:49 +02:00
Maxopoly
5ee38111fe Update Jenkinsfile 2020-09-03 20:56:02 +02:00
Maxopoly
d99f62acf4 Update Jenkinsfile 2020-09-03 20:54:48 +02:00
Maxopoly
583a68eef7 Actual fix maven setup 2020-07-30 21:53:28 +02:00
Maxopoly
433690bda2 Fix up 1.16 NMS 2020-07-30 21:53:28 +02:00
Maxopoly
03f1ec4239 Update to 1.16 2020-07-30 21:53:28 +02:00
Maxopoly
93efdc6ceb Merge pull request #30 from squareblob/dev 
Split long permission descriptions over multiple lines
 2020-07-28 05:57:29 +02:00
BuildTools
8d12c1b9c2 Split long permission descriptions across multiple lines (PermissionManageGUI) 2020-07-27 23:43:10 -04:00
Maxopoly
54f8ff20ed Comment out javadoc, because this maven setup is broken 2020-06-11 23:43:31 +02:00
Maxopoly
0aa7df9add Update Jenkinsfile 2020-06-11 23:37:51 +02:00
Maxopoly
d8d6d956d6 Add civ jenkins 2020-06-01 11:00:46 +02:00
Maxopoly
fd4767471e Trigger cascading build non-blocking 2020-05-29 06:57:28 +02:00
Maxopoly
ce4adbd3cb Bump CMC version 2020-05-29 05:07:58 +02:00
Maxopoly
e080912828 Add distManagement explicitly 2020-05-29 05:06:18 +02:00
Maxopoly
a251742571 Dont use profile for now 2020-05-29 05:01:35 +02:00
Maxopoly
f1e304f670 Add jenkinsfile 2020-05-29 04:51:53 +02:00
Maxopoly
d1c3091ee1 Merge pull request #14 from Diet-Cola/master 
Fix currentMember check on password join
 2020-05-04 02:30:07 +02:00
Cola
77dd06d993 Fix currentMember check on password join 2020-05-03 23:10:54 +01:00
Maxopoly
c6b787be83 Follow up to squares docu fix 2020-05-02 04:08:01 +02:00
Maxopoly
da78e0d697 Merge remote-tracking branch 'squareblob/patch-1' into civ14 2020-05-02 04:06:45 +02:00
Maxopoly
a6b8abcf6b Properly switch windows in permission gui 2020-04-27 22:50:50 +02:00
Maxopoly
a468a9fbef Dont kill db on shutdown 2020-04-25 01:14:43 +02:00
Maxopoly
e70f9576c8 Fix permission addition 2020-04-17 01:58:04 +02:00
Maxopoly
a4f4567191 Merge pull request #13 from Falvyu/master 
Fixed bug where blacklisted players could join password protected groups
 2020-03-29 06:39:31 +02:00
Falvyu
b3d43ae9cb Prevents blacklisted players from joining password protected groups with the GUI 2020-03-28 22:30:39 +01:00
Maxopoly
131980ae41 Fix plugin.yml 2020-03-28 22:30:35 +01:00
Maxopoly
e618a6a4b8 Merge 1.12 changes into 1.14 branch 2020-03-28 22:29:34 +01:00
Maxopoly
0611ca9d65 Improve default perm initiation 2020-03-28 22:09:06 +01:00
Falvyu
2fd5be20be Fixed bug where blacklisted players could join password protected groups. 2020-03-28 18:53:25 +01:00
Maxopoly
8e6954084d Halfway through merging changes 2020-03-21 04:19:54 +01:00
Maxopoly
178050a180 Merge pull request #12 from AngrySoundTech/feature/specific-perm-blacklisting 
Allow certain permissions to not be toggle able for non-blacklisted players
 2020-03-21 02:33:55 +01:00
AngrySoundTech
49f669dd12 Create migration to remove BASTION_PLACE permissions from not-blacklisted players 2020-03-20 21:12:07 -04:00
AngrySoundTech
bc8c106f8f Disallow toggling permissions for blacklist via gui that cannot be blacklisted 
Adds another check before adding click functionality, which will also append a message why it can't in this specific case.

Logic for checking canEdit moved inside the loop to refresh every time, but if this turns out to be an expensive call and I'm not realising that we we can pop it back out and just store what it has.
 2020-03-20 00:10:15 -04:00
AngrySoundTech
a0e08f32f9 Disallow changing permissions that cannot be blacklisted via command 2020-03-20 00:10:15 -04:00
AngrySoundTech
53dd3973e7 Add option for PermissionType to be disallowed from not blacklisted. 
To be used later for disallowing toggling of certain permissions
 2020-03-20 00:10:15 -04:00
Maxopoly
365c859855 Merge pull request #11 from Protonull/master 
NameLayer fixes
 2020-01-12 02:08:13 +01:00
Alexander
bcb50033e9 Fixed some minor console logging issues 2020-01-10 02:41:00 +00:00
Alexander
604e80de35 Remove Mercury entirely 2020-01-10 02:31:23 +00:00