Skip to content

Commit 6d7172c

Browse files
author
urpagin
committed
Merge branch 'dev'. SLP working!
2 parents 3bb4cfd + 830d64e commit 6d7172c

File tree

17 files changed

+1412
-362
lines changed

17 files changed

+1412
-362
lines changed

.editorconfig

Lines changed: 0 additions & 17 deletions
This file was deleted.

.gitignore

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ release/
44
rls/
55
*.o
66
.vscode/
7-
7+
perf.data
88
# Generated by Cargo
99
# will have compiled files and executables
1010
debug/
@@ -108,25 +108,31 @@ fabric.properties
108108
.idea/caches/build_file_checksums.ser
109109

110110
.idea/
111+
112+
111113
# different file generated by the server
112114

113115

114-
# World folder
115-
world/*
116-
world/DIM1/
117-
world/DIM-1/
118-
world/region/
119-
# logs folder
116+
# World directories
117+
world/
118+
119+
# Logs directory
120120
logs/
121121

122122

123-
#conf files
123+
# Configuration files
124124
ops.json
125125
whitelist.json
126126
banned-ips.json
127127
banned-players.json
128128
usercache.json
129129
session.lock
130130
version.json
131-
server.properties
131+
*.properties
132132
eula.txt
133+
134+
# macOS files
135+
.DS_Store
136+
137+
# Other
138+
.editorconfig

0 commit comments

Comments
 (0)