Merge branch 'development' into questing
Showing
- src/main/java/emu/grasscutter/command/commands/GiveCommand.java 1 addition, 1 deletion...in/java/emu/grasscutter/command/commands/GiveCommand.java
- src/main/java/emu/grasscutter/command/commands/SetConstCommand.java 85 additions, 0 deletions...ava/emu/grasscutter/command/commands/SetConstCommand.java
- src/main/java/emu/grasscutter/data/GameData.java 6 additions, 0 deletionssrc/main/java/emu/grasscutter/data/GameData.java
- src/main/java/emu/grasscutter/data/ResourceLoader.java 31 additions, 19 deletionssrc/main/java/emu/grasscutter/data/ResourceLoader.java
- src/main/java/emu/grasscutter/game/entity/EntityGadget.java 1 addition, 0 deletionssrc/main/java/emu/grasscutter/game/entity/EntityGadget.java
- src/main/java/emu/grasscutter/game/quest/GameMainQuest.java 5 additions, 7 deletionssrc/main/java/emu/grasscutter/game/quest/GameMainQuest.java
- src/main/java/emu/grasscutter/game/quest/QuestEncryptionKey.java 12 additions, 0 deletions...n/java/emu/grasscutter/game/quest/QuestEncryptionKey.java
- src/main/java/emu/grasscutter/game/quest/QuestManager.java 7 additions, 2 deletionssrc/main/java/emu/grasscutter/game/quest/QuestManager.java
- src/main/java/emu/grasscutter/scripts/data/SceneGadget.java 1 addition, 0 deletionssrc/main/java/emu/grasscutter/scripts/data/SceneGadget.java
- src/main/resources/languages/en-US.json 8 additions, 0 deletionssrc/main/resources/languages/en-US.json
- src/main/resources/languages/es-ES.json 8 additions, 0 deletionssrc/main/resources/languages/es-ES.json
- src/main/resources/languages/fr-FR.json 36 additions, 28 deletionssrc/main/resources/languages/fr-FR.json
- src/main/resources/languages/pl-PL.json 8 additions, 0 deletionssrc/main/resources/languages/pl-PL.json
- src/main/resources/languages/ro-RO.json 8 additions, 0 deletionssrc/main/resources/languages/ro-RO.json
- src/main/resources/languages/ru-RU.json 9 additions, 1 deletionsrc/main/resources/languages/ru-RU.json
- src/main/resources/languages/zh-CN.json 8 additions, 0 deletionssrc/main/resources/languages/zh-CN.json
- src/main/resources/languages/zh-TW.json 8 additions, 0 deletionssrc/main/resources/languages/zh-TW.json
Please register or sign in to comment