Resolve merge conflicts

oh my god I should've updated my local branch before doing this
2019-03-08 14:44:49 -06:00
parent 0c2af85ac0 76297e8176
commit c38d17563d
54 changed files with 585 additions and 301 deletions
@@ -16,7 +16,7 @@
 */

 group 'baritone'
-version '1.2.1'
+version '1.2.3'

 buildscript {
    repositories {