Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-03-22 23:53:59 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
956d4023c725deb11a0068c17dd459b6c8240ac0
Grasscutter/src/main
History
KingRainbow44 956d4023c7 Merge branch 'development' into more-events 
# Conflicts:
#	src/main/java/emu/grasscutter/command/commands/TeleportAllCommand.java
#	src/main/java/emu/grasscutter/game/entity/EntityAvatar.java
#	src/main/java/emu/grasscutter/game/entity/GameEntity.java
#	src/main/java/emu/grasscutter/game/managers/mapmark/MapMarksManager.java
2022-07-22 17:52:58 -04:00
..
java/emu/grasscutter
Merge branch 'development' into more-events
2022-07-22 17:52:58 -04:00
resources
Translated new changes in languages files to Spanish
2022-07-23 03:01:58 +09:30