Commit Graph

  • 50b5edde6e
    Merge pull request #59 from alt3ri/patch-5 Melledy 2022-04-20 13:58:03 -0700
  • 8fe1ae3a17 Merge pull request #59 from alt3ri/patch-5 Melledy 2022-04-20 13:58:03 -0700
  • d3bb409360
    rsp sorry Yazawazi 2022-04-21 04:51:45 +0800
  • d470cf76d8 rsp sorry Yazawazi 2022-04-21 04:51:45 +0800
  • 8d4d4a3203
    Added Elemental Bonus alt3ri 2022-04-21 03:47:17 +0700
  • d33ab09e5f Added Elemental Bonus alt3ri 2022-04-21 03:47:17 +0700
  • eb6bb1da07
    teleports Yazawazi 2022-04-21 04:45:38 +0800
  • 6f43c0765f teleports Yazawazi 2022-04-21 04:45:38 +0800
  • 49475a92dd
    Adding Elemental DMG Bonus alt3ri 2022-04-21 03:43:57 +0700
  • d0529641b3 Adding Elemental DMG Bonus alt3ri 2022-04-21 03:43:57 +0700
  • c48eebbd86
    Merge pull request #55 from memetrollsXD/development Melledy 2022-04-20 12:36:42 -0700
  • 19572f46e3 Merge pull request #55 from memetrollsXD/development Melledy 2022-04-20 12:36:42 -0700
  • 3b103f2733
    Events, Gradle Update, and Gacha Reload Magix 2022-04-20 12:47:38 -0400
  • f35f76f372 Events, Gradle Update, and Gacha Reload Magix 2022-04-20 12:47:38 -0400
  • 26c0fc3e7b Reload command now reloads gacha config (again) Benjamin Elsdon 2022-04-21 00:28:14 +0800
  • 482c174ee7 Reload command now reloads gacha config (again) Benjamin Elsdon 2022-04-21 00:28:14 +0800
  • 094674124e Merge remote-tracking branch 'upstream/development' Benjamin Elsdon 2022-04-21 00:25:47 +0800
  • 41b4965aef Merge remote-tracking branch 'upstream/development' Benjamin Elsdon 2022-04-21 00:25:47 +0800
  • 1f19471270
    Merge branch 'MlgmXyysd-patch-1' into development KingRainbow44 2022-04-20 12:18:18 -0400
  • 757b9c9d02 Merge branch 'MlgmXyysd-patch-1' into development KingRainbow44 2022-04-20 12:18:18 -0400
  • 6710f04b71
    Fix command map KingRainbow44 2022-04-20 12:17:56 -0400
  • 69aa6130e9 Fix command map KingRainbow44 2022-04-20 12:17:56 -0400
  • e80a14b7dc Custom Y position on MarkMapReq memetrollsXD 2022-04-20 17:55:33 +0200
  • d5d9056452 Custom Y position on MarkMapReq memetrollsXD 2022-04-20 17:55:33 +0200
  • e4b622800e
    Merge pull request #54 from Grasscutters/auto-account Melledy 2022-04-20 07:53:24 -0700
  • 6e14676abf Merge pull request #54 from Grasscutters/auto-account Melledy 2022-04-20 07:53:24 -0700
  • dee3afcaf8 Fix account not found issue when logging in Melledy 2022-04-20 03:28:54 -0700
  • 1ed04d32cf Fix account not found issue when logging in Melledy 2022-04-20 03:28:54 -0700
  • 8a3af10162 Merge branch 'development' of https://github.com/Melledy/Grasscutter Benjamin Elsdon 2022-04-20 21:38:59 +0800
  • cb104ac79a Merge branch 'development' of https://github.com/Melledy/Grasscutter Benjamin Elsdon 2022-04-20 21:38:59 +0800
  • 0811c52f75
    Merge pull request #52 from iTruth/development Melledy 2022-04-20 06:25:00 -0700
  • cff73cd6b9 Merge pull request #52 from iTruth/development Melledy 2022-04-20 06:25:00 -0700
  • 726f03e510
    Add setstats command Jaida Wu 2022-04-20 21:15:37 +0800
  • 4d8a16ece8 Add setstats command Jaida Wu 2022-04-20 21:15:37 +0800
  • 11ca0cd735 Fix playerOpt is always throw an exception when it's null iTruth 2022-04-20 21:14:18 +0800
  • de0a14a589 Fix playerOpt is always throw an exception when it's null iTruth 2022-04-20 21:14:18 +0800
  • 343acc8c6f
    Add restart command Jaida Wu 2022-04-20 21:06:59 +0800
  • 54faab8f0d Add restart command Jaida Wu 2022-04-20 21:06:59 +0800
  • eff5541a43
    Merge branch 'Grasscutters:stable' into main junu128 2022-04-20 21:04:31 +0800
  • 53b36489a6 Merge branch 'Grasscutters:stable' into main junu128 2022-04-20 21:04:31 +0800
  • 44d0adea89
    Correct pos usage Jaida Wu 2022-04-20 21:04:09 +0800
  • 00a746be3c Correct pos usage Jaida Wu 2022-04-20 21:04:09 +0800
  • 0dabb4c7c2
    Add weather command Jaida Wu 2022-04-20 21:03:30 +0800
  • e8a3059907 Add weather command Jaida Wu 2022-04-20 21:03:30 +0800
  • f898795c11
    Add pos command Jaida Wu 2022-04-20 20:58:57 +0800
  • c42fa4ee5d Add pos command Jaida Wu 2022-04-20 20:58:57 +0800
  • 87c7fba2d2
    Save account to database Jaida Wu 2022-04-20 20:56:22 +0800
  • b44df66c94 Save account to database Jaida Wu 2022-04-20 20:56:22 +0800
  • c42d6d81f6
    Rewrite commands Jaida Wu 2022-04-20 20:21:38 +0800
  • 63cb0a8174 Rewrite commands Jaida Wu 2022-04-20 20:21:38 +0800
  • 337ed4c197
    Merge pull request #49 from Grasscutters/dev-abilities Melledy 2022-04-20 05:15:32 -0700
  • 7fc587e7d6 Merge pull request #49 from Grasscutters/dev-abilities Melledy 2022-04-20 05:15:32 -0700
  • 395849a015 Merge branch 'stable' into development Melledy 2022-04-20 05:14:23 -0700
  • b2cec3b8bc Merge branch 'stable' into development Melledy 2022-04-20 05:14:23 -0700
  • e8112065ad
    Merge pull request #41 from w4123/npctalk_patch Melledy 2022-04-20 04:51:42 -0700
  • b3db933a16 Merge pull request #41 from w4123/npctalk_patch Melledy 2022-04-20 04:51:42 -0700
  • 99adb2c54b
    Merge pull request #44 from Yazawazi/main Melledy 2022-04-20 04:50:48 -0700
  • 105efe1d81 Merge pull request #44 from Yazawazi/main Melledy 2022-04-20 04:50:48 -0700
  • ac9c4efd2a
    Merge pull request #48 from alt3ri/patch-4 Melledy 2022-04-20 04:49:48 -0700
  • dfbc0063b4 Merge pull request #48 from alt3ri/patch-4 Melledy 2022-04-20 04:49:48 -0700
  • 3b62ee67c0
    Merge pull request #46 from MlgmXyysd/main Melledy 2022-04-20 04:49:37 -0700
  • af88b4cfde Merge pull request #46 from MlgmXyysd/main Melledy 2022-04-20 04:49:37 -0700
  • a507172d81
    Replace SetHealth -> SetStats alt3ri 2022-04-20 18:24:32 +0700
  • c603093d47 Replace SetHealth -> SetStats alt3ri 2022-04-20 18:24:32 +0700
  • 31d89369c4
    Merge branch 'development' into main Yazawazi 2022-04-20 19:09:48 +0800
  • 7e6bcca2c3 Merge branch 'development' into main Yazawazi 2022-04-20 19:09:48 +0800
  • d320ad963e
    Merge pull request #47 from alt3ri/patch-3 Melledy 2022-04-20 03:43:59 -0700
  • d388950193 Merge pull request #47 from alt3ri/patch-3 Melledy 2022-04-20 03:43:59 -0700
  • cfb13acb7d Fix character abilities not showing for others in co-op/lasting too long Melledy 2022-04-20 03:42:59 -0700
  • 5a09c22aa1 Fix character abilities not showing for others in co-op/lasting too long Melledy 2022-04-20 03:42:59 -0700
  • 1e7d537965
    Adding /pos alt3ri 2022-04-20 17:40:26 +0700
  • aeb335c843 Adding /pos alt3ri 2022-04-20 17:40:26 +0700
  • 968693b84d Fix account not found issue when logging in Melledy 2022-04-20 03:28:54 -0700
  • fda205015b Fix account not found issue when logging in Melledy 2022-04-20 03:28:54 -0700
  • bde8a21140
    Optimize proxy scripts Jaida Wu 2022-04-20 18:13:26 +0800
  • 087cd680bd Optimize proxy scripts Jaida Wu 2022-04-20 18:13:26 +0800
  • 7bca4e4c30 Added OnGameServerStartFinish EventBus Benjamin Elsdon 2022-04-20 17:44:44 +0800
  • e8601de5d5 Added OnGameServerStartFinish EventBus Benjamin Elsdon 2022-04-20 17:44:44 +0800
  • c15fc9b6fc Added OnGameServerStop EventBus Benjamin Elsdon 2022-04-20 17:31:41 +0800
  • b7f5cc9748 Added OnGameServerStop EventBus Benjamin Elsdon 2022-04-20 17:31:41 +0800
  • 93ae8742c0 Merge branch 'development' of https://github.com/Melledy/Grasscutter Benjamin Elsdon 2022-04-20 17:18:51 +0800
  • 22781ac6e7 Merge branch 'development' of https://github.com/Melledy/Grasscutter Benjamin Elsdon 2022-04-20 17:18:51 +0800
  • 149ebaabdb /reload now reloads the gacha as well Benjamin Elsdon 2022-04-20 17:17:59 +0800
  • 1c2560736f /reload now reloads the gacha as well Benjamin Elsdon 2022-04-20 17:17:59 +0800
  • 2f90946da5
    Merge pull request #40 from Grasscutters/auto-account Melledy 2022-04-20 02:17:21 -0700
  • 88e608adba Merge pull request #40 from Grasscutters/auto-account Melledy 2022-04-20 02:17:21 -0700
  • bba5af331b
    Merge pull request #31 from alt3ri/patch-1 Melledy 2022-04-20 02:16:56 -0700
  • a3beffac06 Merge pull request #31 from alt3ri/patch-1 Melledy 2022-04-20 02:16:56 -0700
  • 7c557093db
    Update README.md Melledy 2022-04-20 02:16:39 -0700
  • df264bacd9 Update README.md Melledy 2022-04-20 02:16:39 -0700
  • 51e1afefba
    Add /weather Command Yazawazi 2022-04-20 17:16:21 +0800
  • 500580f368 Add /weather Command Yazawazi 2022-04-20 17:16:21 +0800
  • fa8019ba74
    Merge pull request #37 from memetrollsXD/restart-command Melledy 2022-04-20 02:14:32 -0700
  • f52a1ae183 Merge pull request #37 from memetrollsXD/restart-command Melledy 2022-04-20 02:14:32 -0700
  • ba56ccff1e Out of my madness and suffering I have achieved the impossible. I almost lost all hope and was about to end it all. However, it worked out in the end and now we have gacha reloading. Benjamin Elsdon 2022-04-20 17:14:07 +0800
  • 26e1341ce9 Out of my madness and suffering I have achieved the impossible. I almost lost all hope and was about to end it all. However, it worked out in the end and now we have gacha reloading. Benjamin Elsdon 2022-04-20 17:14:07 +0800
  • a498b81a24 Forgot config check Benjamin Elsdon 2022-04-20 16:07:18 +0800
  • 28a070f19a Forgot config check Benjamin Elsdon 2022-04-20 16:07:18 +0800
  • c08a341b20 Update gradle + Work gacha reload (gs broken atm) Benjamin Elsdon 2022-04-20 16:05:53 +0800
  • d59799ce55 Update gradle + Work gacha reload (gs broken atm) Benjamin Elsdon 2022-04-20 16:05:53 +0800