Commit Graph

192 Commits

Author SHA1 Message Date
eda93d1085 Removed "BiomesOPlenty" mod. 2022-05-13 14:29:46 -05:00
aeecd25619 Synced server with current version of modpack. 2022-05-13 13:56:37 -05:00
4057dcb14d Removed automatic modpack integration stages. 2022-05-13 04:36:28 -05:00
5a4ff41744 Removed unecessary merge. 2022-05-13 04:33:27 -05:00
3eaa38abeb Merge branch 'develop' into sync-modpack 2022-05-13 04:24:15 -05:00
6501f76cda Generate render data and persist. 2022-05-13 04:23:50 -05:00
dd9cc6f8b9 Updated Jenkinsfile. 2022-05-13 03:40:45 -05:00
bf8fdaaddc Updated Jenkinsfile. 2022-05-13 03:39:06 -05:00
7831e81d8f Updated Jenkinsfile. 2022-05-13 03:23:34 -05:00
675f8bd7e4 Update Jenkinsfile. 2022-05-13 03:22:58 -05:00
ad7043d33b Updated Jenkinsfile. 2022-05-13 03:21:18 -05:00
4e234fa43e Updated Jenkinsfile. 2022-05-13 03:18:50 -05:00
3c87d3b8a8 Updated Jenkinsfile. 2022-05-13 03:15:43 -05:00
3633c4cee8 Fixed Jenkinsfile "commit changes" stage. 2022-05-13 03:13:29 -05:00
93609893eb Changed modpack integration technique. 2022-05-13 03:06:09 -05:00
279db25563 Updated update script server file url. 2022-05-13 02:56:15 -05:00
Jenkins
7a025a0a4d Merge branch 'latest-modpack' of https://dev.sys.reslate.xyz/git/ydeng/rsemcs into latest-modpack 2022-05-13 02:38:04 -05:00
Jenkins
e1493c872c Automatic integration of latest modpack. 2022-05-13 02:38:04 -05:00
Jenkins
9469499e65 Merge branch 'latest-modpack' of https://dev.sys.reslate.xyz/git/ydeng/rsemcs into latest-modpack 2022-05-13 02:24:53 -05:00
Jenkins
0c06e38660 Automatic integration of latest modpack. 2022-05-13 02:24:52 -05:00
Jenkins
9631636303 Merge branch 'latest-modpack' of https://dev.sys.reslate.xyz/git/ydeng/rsemcs into latest-modpack 2022-05-13 02:15:09 -05:00
Jenkins
519adbb29c Automatic integration of latest modpack. 2022-05-13 02:15:08 -05:00
59741ad3db Updated Jenkinsfile. 2022-05-13 01:58:36 -05:00
0cf95dbd77 Do not run tests on latest-modpack branch in Jenkinsfile. 2022-05-13 00:28:31 -05:00
Jenkins
8cc3ecd3cf Merge branch 'latest-modpack' of https://dev.sys.reslate.xyz/git/ydeng/rsemcs into latest-modpack 2022-05-13 00:26:57 -05:00
Jenkins
a5831b8417 Automatic integration of latest modpack. 2022-05-13 00:26:56 -05:00
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