Commit Graph

235 Commits

Author SHA1 Message Date
24e0674134 Merge branch 'delta' 2022-05-10 21:33:11 -05:00
ca1aa9fc8f Added "live" branch to represent live server. 2022-04-16 00:57:47 -05:00
c860c9692d Automatic server data synchronization commit. 2022-04-16 00:50:34 -05:00
Jenkins
447e25881d Merge remote-tracking branch 'origin/delta' 2022-04-16 00:35:08 -05:00
1113799a0f Inverting launch controls. 2022-04-16 00:33:33 -05:00
Jenkins
eab7b6496f Merge remote-tracking branch 'origin/delta' 2022-04-15 21:55:48 -05:00
3fad8820e5 Changed java version to 18. 2022-04-15 21:52:55 -05:00
Jenkins
4977db796f Merge remote-tracking branch 'origin/delta' 2022-01-20 03:21:46 -06:00
3dd0b4cd0f Fixed checkout pipeline error. 2022-01-20 03:19:52 -06:00
Jenkins
935cc3d6a7 Merge remote-tracking branch 'origin/delta' 2022-01-20 03:19:07 -06:00
04996cc087 Removed setup stage and now only run queue stage on delta branch. 2022-01-20 03:03:44 -06:00
ed23d5190e Renamed startup check stage and restored queue stage. 2022-01-20 03:00:47 -06:00
0dedd3c904 Renamed test stage of jenkins pipeline. 2022-01-20 00:49:55 -06:00
a6645ddede Merge branch 'master' of dev.sys.reslate.xyz:ydeng/rsemcs 2022-01-19 22:14:18 -06:00
949ec1c041 Merge branch 'delta'. 2022-01-19 22:13:14 -06:00
14dfd2829b Removed unecessary Jenkins pipeline commands. 2022-01-19 21:34:08 -06:00
f8a021a8f0 Updated git credentials for Jenkins pipeline. 2022-01-19 20:01:43 -06:00
f907f2453f Removed the queue step. 2022-01-19 02:45:49 -06:00
Jenkins
56a5a7b58a Merge remote-tracking branch 'origin/delta' 2022-01-18 13:01:31 -06:00
1d652fa3cd Ignored update script. 2022-01-18 12:59:47 -06:00
Jenkins
de3fe6cb29 Merge remote-tracking branch 'origin/delta' 2022-01-18 12:57:02 -06:00
a2f0c2cc58 FIxed checkout issue in update script. 2022-01-18 12:54:57 -06:00
Jenkins
43cf578225 Merge remote-tracking branch 'origin/delta' 2022-01-17 19:02:51 -06:00
98844dec3a Now uses direct path to java 17 to run. 2022-01-17 18:59:11 -06:00
Jenkins
0d0c6be832 Merge remote-tracking branch 'origin/delta' 2022-01-17 04:56:04 -06:00
f60dfec570 Background set to be transparent. 2022-01-17 04:53:56 -06:00
c0d3694677 Dynmap page title changed. 2022-01-17 04:53:47 -06:00
Jenkins
0ada99b267 Merge remote-tracking branch 'origin/delta' 2022-01-11 14:16:53 -06:00
69a757ec62 Updated PaperMC server jar. 2022-01-11 14:14:48 -06:00
a2df6a26eb Removed version tagging.
Potentially to be reimplemented in the future.
2022-01-11 14:14:26 -06:00
Jenkins
bf34eca8e0 Merge remote-tracking branch 'origin/delta' 2022-01-11 01:22:42 -06:00
704692a449 Jenkins pipeline now uses default merge message. 2022-01-11 01:20:56 -06:00
Jenkins
ba3da6b761 Automatically merged delta branch to master. 2022-01-11 01:07:23 -06:00
f34cd87308 Updated patch version number. 2022-01-11 01:05:26 -06:00
9c27af67a5 Jenkins pipeline no longer automatically updates versioning. 2022-01-11 01:01:42 -06:00
Jenkins
1d4f338afd Automatically merged delta branch to master. 2022-01-10 23:11:50 -06:00
Jenkins
1d93f5ba22 Updated version number for next patch. 2022-01-10 23:11:41 -06:00
Jenkins
8d057c6c44 Updated version number for next patch. 2022-01-10 23:05:06 -06:00
Jenkins
ff67560d61 Updated version number for next patch. 2022-01-10 23:05:06 -06:00
0b2d298d07 Charged protection stone artifact is now named appropriately. 2022-01-10 22:59:01 -06:00
Jenkins
f6a3f0b749 Automatically merged delta branch to master. 2022-01-10 16:11:50 -06:00
Jenkins
a9bf040d65 Updated version number for next patch. 2022-01-10 16:11:40 -06:00
Jenkins
375f181bb1 Automatically merged delta branch to master. 2022-01-10 15:03:34 -06:00
Jenkins
1a638becd3 Updated version number for next patch. 2022-01-10 15:03:25 -06:00
fb80cdd343 Merge branch 'delta' of dev.sys.reslate.xyz:ydeng/REMCS into delta 2022-01-10 14:50:27 -06:00
a979a35b6b Dynmap configuration changes.
Ip is now required to match a known player.
Webchat interval has been reduced from 5 seconds to 2 seconds.
2022-01-10 14:50:24 -06:00
Jenkins
b6418796be Automatically merged delta branch to master. 2022-01-10 05:18:17 -06:00
Jenkins
6a0b0a9c1c Updated version number for next patch. 2022-01-10 05:18:07 -06:00
d94cf30d6a Updated smoothtimber. 2022-01-10 05:16:24 -06:00
Jenkins
1d8cf17b81 Automatically merged delta branch to master. 2022-01-10 05:04:07 -06:00