Commit Graph

216 Commits

Author SHA1 Message Date
fa79ec8feb Merge branch 'develop' of dev.sys.reslate.xyz:ydeng/rsemcs into develop 2022-05-13 00:26:30 -05:00
7c9abbb886 Ignore dynmap block scanner errors in Jenkinsparse. 2022-05-13 00:25:53 -05:00
0c227d9aea Removed Biomes 'O Plenty. 2022-05-13 00:25:53 -05:00
71fb9c133c Increased max tick time. 2022-05-13 00:25:53 -05:00
308211e94e Added block scanner for dynmap. 2022-05-13 00:25:53 -05:00
6206e7bdec Updated spawn protection size. 2022-05-13 00:25:53 -05:00
Jenkins
4123c4e939 Automatic integration of latest modpack. 2022-05-13 00:01:04 -05:00
e5f0b8845c Merge branch 'master' into develop 2022-05-12 23:47:44 -05:00
894145767b Removed Biomes 'O Plenty. 2022-05-12 23:47:02 -05:00
6fad627c3a Increased max tick time. 2022-05-12 23:27:59 -05:00
Jenkins
e02f5e04e6 Merge branch 'latest-modpack' of https://dev.sys.reslate.xyz/git/ydeng/rsemcs into latest-modpack 2022-05-12 23:27:58 -05:00
Jenkins
4f405f3116 Automatic integration of latest modpack. 2022-05-12 23:27:57 -05:00
Jenkins
8065fe1018 Merge branch 'latest-modpack' of https://dev.sys.reslate.xyz/git/ydeng/rsemcs into latest-modpack 2022-05-12 23:14:31 -05:00
Jenkins
96c9875601 Automatic integration of latest modpack. 2022-05-12 23:14:30 -05:00
63a7de0677 Added block scanner for dynmap. 2022-05-12 23:12:01 -05:00
24d1f0894b Updated spawn protection size. 2022-05-12 23:11:45 -05:00
Jenkins
13db6c45d9 Merge branch 'latest-modpack' of https://dev.sys.reslate.xyz/git/ydeng/rsemcs into latest-modpack 2022-05-12 22:23:17 -05:00
Jenkins
3035a456f5 Automatic integration of latest modpack. 2022-05-12 22:23:16 -05:00
e09496c6db Updated Jenkinsfile. 2022-05-12 22:18:03 -05:00
Jenkins
178a9e7dd9 Merge branch 'latest-modpack' of https://dev.sys.reslate.xyz/git/ydeng/rsemcs into latest-modpack 2022-05-12 22:13:40 -05:00
Jenkins
ca836ef7b3 Automatic integration of latest modpack. 2022-05-12 22:13:39 -05:00
eddd3b8d9a Removed WorldEditItems. 2022-05-12 22:03:51 -05:00
88e0f5af64 Updated max-player count and motd. 2022-05-12 21:28:29 -05:00
04f43b116e Changed webserver port for dynmap. 2022-05-12 21:11:32 -05:00
Jenkins
305552e8d9 Automatic integration of latest modpack. 2022-05-12 21:01:40 -05:00
177ec66273 Merge branch 'develop' 2022-05-12 20:55:40 -05:00
e5d6124ecd Merge remote-tracking branch 'origin/latest-modpack' into develop 2022-05-12 20:55:15 -05:00
6db8c4a2bd Merge branch 'latest-modpack' into develop 2022-05-12 20:55:09 -05:00
Jenkins
196937af66 Merge branch 'latest-modpack' of https://dev.sys.reslate.xyz/git/ydeng/rsemcs into latest-modpack 2022-05-12 20:47:08 -05:00
Jenkins
31b65e66b6 Automatic integration of latest modpack. 2022-05-12 20:47:07 -05:00
c90df770b7 Updated Jenkinsfile. 2022-05-12 16:34:02 -05:00
4d4c2ae3fe Updated Jenkinsfile. 2022-05-12 16:15:43 -05:00
Jenkins
643a470ded Merge branch 'latest-modpack' of https://dev.sys.reslate.xyz/git/ydeng/rsemcs into latest-modpack 2022-05-12 16:05:57 -05:00
Jenkins
75ff539799 Automatic integration of latest modpack. 2022-05-12 16:05:56 -05:00
5a74f869bb Updated Jenkinsfile. 2022-05-12 15:59:40 -05:00
2c425e5678 Only load configs that don't already exist. 2022-05-12 15:54:49 -05:00
Jenkins
93abb5d68f Merge branch 'latest-modpack' of https://dev.sys.reslate.xyz/git/ydeng/rsemcs into latest-modpack 2022-05-12 15:53:40 -05:00
Jenkins
3d240b335d Automatic integration of latest modpack. 2022-05-12 15:53:39 -05:00
7ae98418bf Updated Jenkinsfile. 2022-05-12 15:39:49 -05:00
Jenkins
18de5641cd Merge branch 'latest-modpack' of https://dev.sys.reslate.xyz/git/ydeng/rsemcs into latest-modpack 2022-05-12 15:33:15 -05:00
Jenkins
f4b855a919 Automatic integration of latest modpack. 2022-05-12 15:33:14 -05:00
5da7d6eec5 Merge branch 'develop' into latest-modpack 2022-05-12 15:31:50 -05:00
e19da4c362 Server launch test occurs on all branches. 2022-05-12 15:31:23 -05:00
c6b603a902 Removed unecessary git checkout in Jenkinsfile. 2022-05-12 15:27:55 -05:00
Jenkins
7e457a3158 Merge branch 'latest-modpack' of https://dev.sys.reslate.xyz/git/ydeng/rsemcs into latest-modpack 2022-05-12 15:25:40 -05:00
Jenkins
aa1df0756d Automatic integration of latest modpack. 2022-05-12 15:25:38 -05:00
13ddc5f350 Don't run server launch test stage on modpack merge branch. 2022-05-12 15:20:03 -05:00
Jenkins
13e8ea6383 Merge branch 'latest-modpack' of https://dev.sys.reslate.xyz/git/ydeng/rsemcs into latest-modpack 2022-05-12 15:18:05 -05:00
Jenkins
39918d719a Automatic integration of latest modpack. 2022-05-12 15:18:04 -05:00
88d3ada2fe Updated Jenkinsfile. 2022-05-12 15:12:45 -05:00