Commit Graph

197 Commits

Author SHA1 Message Date
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
8bbec1a94f Updated Jenkinsfile. 2022-05-12 14:58:54 -05:00
67af781e63 Added start line to Jenkinsparse. 2022-05-12 14:55:22 -05:00
Jenkins
ff418f6754 Automatic integration of latest modpack. 2022-05-12 14:49:19 -05:00
ffe9eb3955 Updated Jenkinsfile. 2022-05-12 14:45:36 -05:00
6995431524 Updated Jenkinsparse. 2022-05-12 14:44:42 -05:00
0c2c58e4a4 Updated Jenkinsfile. 2022-05-12 14:44:05 -05:00
3ee2387ddf Updated Jenkinsfile. 2022-05-12 14:38:00 -05:00
8d00aa9852 Fixed command argument typo in pipeline. 2022-05-12 14:27:11 -05:00
f1c96b02c0 Introduced separate branch for modpack integration. 2022-05-12 14:25:06 -05:00
Jenkins
f01703edaa Automatic integration of latest modpack. 2022-05-12 14:13:56 -05:00
Jenkins
455f99a950 Automatic integration of latest modpack. 2022-05-12 14:08:49 -05:00
Jenkins
cb2a459cac Automatic integration of latest modpack. 2022-05-12 14:04:19 -05:00
Jenkins
4b97cbc8a1 Automatic integration of latest modpack. 2022-05-12 13:59:24 -05:00
Jenkins
f2587948cc Automatic integration of latest modpack. 2022-05-12 13:54:30 -05:00
Jenkins
1bf5765e57 Automatic integration of latest modpack. 2022-05-12 13:49:34 -05:00
Jenkins
819e30ff06 Automatic integration of latest modpack. 2022-05-12 13:44:38 -05:00
Jenkins
b2ac87015e Automatic integration of latest modpack. 2022-05-12 13:39:30 -05:00
Jenkins
f3a6af1232 Automatic integration of latest modpack. 2022-05-12 13:34:42 -05:00
Jenkins
10458ae7d2 Automatic integration of latest modpack. 2022-05-12 13:29:28 -05:00