CivMC/Civ
1
0
Fork 0
mirror of https://github.com/CivMC/Civ.git synced 2026-07-18 08:30:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,006 Commits 31 Branches 181 Tags
b1fd4e525b39b68e7bfb4cd106b6b39e80464310
Commit Graph

8241 Commits

Author SHA1 Message Date
okx-code
b1fd4e525b remove silly code 2024-11-05 22:57:44 +00:00
okx-code
72a60742a1 cross server chat 2024-11-05 22:51:19 +00:00
okx-code
95f839eb81 . 2024-11-05 21:16:01 +00:00
okx-code
9a39d4acb0 fix spacing 2024-11-05 21:12:28 +00:00
okx-code
acf5b51c04 make warps not case sensitive 2024-11-05 21:11:00 +00:00
okx-code
00515acdd7 reformat + make warps not case sensitive 2024-11-05 21:05:34 +00:00
okx-code
c302ba2298 add arena cap 2024-11-05 21:05:34 +00:00
okx-code
fd768a49f9 only in world 2024-11-05 20:15:32 +00:00
okx-code
605ed5e371 add portal connect hack. also disable javadoc gradle tasks because it's slow 2024-11-05 20:03:13 +00:00
okx-code
5538a94f97 Merge branch 'heliodor2' into swm 2024-11-03 20:50:07 +00:00
okx-code
64ff5fb6fb wrong way round 2024-11-03 20:50:02 +00:00
okx-code
bc211b9e18 Merge branch 'heliodor2' into swm 2024-11-03 16:56:15 +00:00
okx-code
7f8818a8bb fix 2024-11-03 16:56:04 +00:00
okx-code
4f42ffce1d Merge branch 'heliodor2' into swm 2024-11-03 15:55:25 +00:00
okx-code
d097ded2c0 fall damage 2024-11-03 15:55:18 +00:00
okx-code
de7454cb57 Merge branch 'heliodor2' into swm 2024-11-02 23:28:24 +00:00
okx-code
ab4f9cd81e fix desc 2024-11-02 23:28:11 +00:00
okx-code
69e172698a Merge branch 'heliodor2' into swm 2024-11-02 22:54:54 +00:00
okx-code
8d1e6b9fd8 sword not armour 2024-11-02 22:54:49 +00:00
okx-code
5c728a3db2 add chorus 2024-11-02 21:44:47 +00:00
okx-code
a865b2c3ac Merge branch 'heliodor2' into swm 2024-11-02 21:33:53 +00:00
okx-code
3efad61977 fix levels 2024-11-02 21:33:46 +00:00
okx-code
b28f962d09 Merge branch 'heliodor2' into swm 2024-11-02 21:27:34 +00:00
okx-code
cd43f63da8 add more 2024-11-02 21:27:26 +00:00
okx-code
a76246963b Merge branch 'heliodor2' into swm 
# Conflicts:
#	plugins/finale-paper/src/main/java/com/github/maxopoly/finale/Finale.java
#	plugins/finale-paper/src/main/resources/config.yml
 2024-11-02 16:12:42 +00:00
okx-code
a4f4c9e84f add meteoric iron slowness 2024-11-02 16:11:32 +00:00
okx-code
1e68abceba add kb 2024-11-02 15:53:01 +00:00
okx-code
efdab79e89 Merge branch 'heliodor2' into swm 2024-11-02 15:51:35 +00:00
okx-code
8a35058e56 fix names 2024-11-02 15:51:23 +00:00
okx-code
bf02c3d6bc more fixes 2024-11-02 15:13:10 +00:00
okx-code
1353ea1dbc Merge branch 'heliodor2' into swm 2024-11-02 15:05:37 +00:00
okx-code
5a94d7f902 make custom items 2024-11-02 15:05:10 +00:00
okx-code
7d1ec9f7b8 add stuff 2024-11-02 15:03:16 +00:00
okx-code
7a72ec79d9 Merge 2024-11-02 14:58:03 +00:00
okx-code
2165e90e89 heliodor 2024-11-02 14:54:35 +00:00
okx-code
91a0328506 Merge branch 'main' into swm 
# Conflicts:
#	.github/workflows/ansible_update_server.yml
#	plugins/hiddenore-paper/src/main/java/com/github/devotedmc/hiddenore/util/FakePlayer.java
 2024-11-02 00:22:16 +00:00
okx-code
b5f3bab2dd Delete canStorageTeleport 2024-11-01 23:15:55 +00:00
okx-code
22f37608b9 fix repo 2024-11-01 23:14:59 +00:00
okx-code
084fd5d2f2 close connections 2024-11-01 19:34:20 +00:00
okx-code
48eea2187b fix repo 2024-11-01 19:14:03 +00:00
okx-code
e03a17d7ce update items properly 2024-11-01 18:49:32 +00:00
okx-code
cb5e2ab81f don't remove night vision 2024-10-31 13:48:05 +00:00
okx-code
53db1210b2 add spectator spawn 2024-10-31 13:41:56 +00:00
okx-code
6b2a4e2dec oops 2024-10-31 12:48:46 +00:00
okx-code
f88e82e36f add anvil titles and fix inconsistencies 2024-10-31 00:52:14 +00:00
okx-code
38af63a3bb fix duration 2024-10-31 00:21:19 +00:00
okx-code
2868627366 add categories and arena cleaner 2024-10-31 00:18:15 +00:00
okx-code
883b59565a fix spawns 2024-10-30 23:18:00 +00:00
okx-code
759328fc4b fix ally lag 2024-10-28 19:37:53 +00:00
okx-code
e25b4296b8 fix conforms 2024-10-25 20:39:29 +01:00