Merge remote-tracking branch 'origin/master'

This commit is contained in:
Unknown
2018-03-10 22:36:53 +00:00
3 changed files with 6 additions and 7 deletions

View File

@@ -26,8 +26,7 @@
* Each file must be self contained with no _G varibles
#### Forks and Pull Requests
* We are happy for people to make pull requets if you wish to help make our server better
* You can add a comment at the start of the file to mark any changes you make, for the credit
* Your server is a comunity server, it is all about the people and feedback is good
* Dont make small changes to the core files, please only big meaniful changes
* Dont be afraid to make a pull request as if it fixes something then its a good change
* We are happy for people to make pull requests if you wish to help make our server better
* You can add comments at the start of files to mark any changes you make, so you are credited
* Don't make small changes to the core files, please only big meaningful changes
* Don't be afraid to make a pull request as if it fixes something then it's a good change

View File

@@ -9,7 +9,7 @@ guildlines-line4=- Hacking / cheating / abusing bugs will not be tolerated.
guildlines-line5=- Be polite and use common sense.
guildlines-line6=- Spamming (in the form of chat, bots, unlimited chests and concrete) is not allowed.
guildlines-line7=- Do not remove stuff without asking your fellow players.
guildlines-line8=- Trains are only allowed in LHD (Left Hand Drive). Train loops and long-distance use is forbidden.
guildlines-line8=- Trains are only allowed in LHD (Left Hand Drive). Train loops.
guildlines-line9=
guildlines-line10=If you have any questions about our rules, the server or Factorio in general, feel free to ask your fellow players or our helpful team. Have fun!
chat-name=How To Chat

View File

@@ -9,7 +9,7 @@ guildlines-line4=- Hacken / cheaten en bugs misbruiken is niet toegestaan.
guildlines-line5=- Wees aardig en gebruik je gezonde verstand.
guildlines-line6=- Spammen (in de zin van chat, kisten en beton) is niet toegestaan.
guildlines-line7=- Geen spullen verwijderen zonder toestemming van andere spelers.
guildlines-line8=- Treinen (LHD - Left Hand Drive) niet loopen of gebruiken voor lange afstanden.
guildlines-line8=- Treinen (LHD - Left Hand Drive) geen loops.
guildlines-line9=
guildlines-line10=Als je vragen hebt over deze regels of over de server in algemeen, aarzel dan niet om contact op te nemen met onze staff.
chat-name=Chatten