Commit Graph

107 Commits

Author SHA1 Message Date
MattBDev
0d2fff2cd2 Upstream Merge 2020-01-10 22:32:12 -05:00
NotMyFault
c037afaf3a Build 1.15 artifacts 2019-12-11 17:49:17 +01:00
NotMyFault
a058f13d6e Updates 2019-12-09 21:34:26 +01:00
Jesse Boyd
1556101a98
java based merging? 2019-11-19 15:10:36 +00:00
Jesse Boyd
82f5c4ebed
Fix compile 2019-11-07 10:28:17 +00:00
MattBDev
c20f4c6b7f Fixed a null pointer. Merged in a bunch of CLI stuff. 2019-09-02 15:22:43 -04:00
Jesse Boyd
4e49d16505
fix dependencies 2019-08-26 05:45:03 +01:00