Signed-off-by: interdpth <interdpth@gmail.com>
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/org/zzl/minegaming/MEH/TileEditorPanel.java

Signed-off-by: interdpth <interdpth@gmail.com>
Signed-off-by: interdpth <interdpth@gmail.com>
Merge pull request #17 from interdpth/master

Stuff