Merge remote-tracking branch 'origin/master'

This commit is contained in:
Alex Stewart committed 2019-03-19 00:05:01 -07:00
commit d56d60558e
26 files changed
+1 -1

No files matched your search

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
+1 -1
View File
@@ -91,7 +91,7 @@ public class CommandYeet extends Command
public static final boolean VERBOSE = false;
public static final int NONE = -1;
public static final int PIXEL_BYTE_LENGTH = 4; // 32-bit PNG, RGBA
public static final String YEET_BASE_PATH = "yeet/frames/";
public static final String YEET_BASE_PATH = "assets/yeet/frames/";
public static final int YEET_BASE_SIZE = 24;
public static final int YEET_FPS = 18;
BIN
View File
Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.3 KiB