Commit ab4aff8
committed
Merge branch 'moveto-1.21.1' of https://github.com/JasonTheKitten/ocreloaded into moveto-1.21.1
2 files changed
Lines changed: 3 additions & 2 deletions
File tree
- projects/Minecraft/src/main
- java/li/cil/ocreloaded/minecraft/client/screen
- resources/assets/ocreloaded/lang
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
55 | 55 | | |
56 | 56 | | |
57 | 57 | | |
58 | | - | |
| 58 | + | |
59 | 59 | | |
60 | 60 | | |
61 | 61 | | |
| |||
Lines changed: 2 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
12 | | - | |
| 12 | + | |
| 13 | + | |
13 | 14 | | |
14 | 15 | | |
15 | 16 | | |
| |||
0 commit comments