Skip to content
This repository has been archived by the owner on Jan 18, 2024. It is now read-only.

Commit

Permalink
Merge remote-tracking branch 'origin/master' into 1.8.9
Browse files Browse the repository at this point in the history 
Conflicts:
	src/main/java/com/kamesuta/mc/signpic/gui/GuiOffset.java
	src/main/java/com/kamesuta/mc/signpic/gui/GuiRotation.java
  • Loading branch information
@Kamesuta
Kamesuta committed Sep 26, 2016
2 parents 7245058 + 58e9241 commit d68cab6
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/main/resources/assets/signpic/lang/en_US.lang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ signpic.gui.editor.offset.y=Y
signpic.gui.editor.offset.y.neg=⇩
signpic.gui.editor.offset.y.pos=⇧
signpic.gui.editor.offset.z=Z
signpic.gui.editor.offset.z.neg=⇗
signpic.gui.editor.offset.z.pos=⇙
signpic.gui.editor.offset.z.neg=↗
signpic.gui.editor.offset.z.pos=↙
## Rotation
signpic.gui.editor.rotation.category=Rotation
signpic.gui.editor.rotation.up=↑
Expand Down

0 comments on commit d68cab6

Please sign in to comment.