Merge remote-tracking branch 'origin/1.12' into 1.12

TeamLapen · Jun 13, 2019 · 1e41bda · 1e41bda
2 parents 96e3237 + 88b8d69
commit 1e41bda
Show file tree

Hide file tree

Showing 18 changed files with 814 additions and 107 deletions.
diff --git a/src/api/java/de/teamlapen/vampirism/api/entity/player/actions/DefaultAction.java b/src/api/java/de/teamlapen/vampirism/api/entity/player/actions/DefaultAction.java
@@ -24,7 +24,7 @@ public DefaultAction(IPlayableFaction<T> faction, ResourceLocation icons) {
     }
 
     /**
-     * Can be overriden to check addidional requirements
+     * Can be overridden to check additional requirements
      *
      * @return
      */
-Original file line number
+Diff line change
@@ Expand Up @@
         }
         /**
-         * Can be overriden to check addidional requirements
+         * Can be overridden to check additional requirements
          *
          * @return
          */
@@ Expand Down @@