CivMC/Civ
1
0
Fork 0
mirror of https://github.com/CivMC/Civ.git synced 2026-07-18 00:20:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,037 Commits 31 Branches 181 Tags
94cc9df689cfd3816f84b2d854cb205a762394ae
Commit Graph

8846 Commits

Author SHA1 Message Date
RedDevel2
94cc9df689 Merge pull request #664 from CivMC/feature/pearl-health-value 
Merge pearl change into branch
 2024-11-25 00:01:09 +01:00
okx-code
d44b486d9a update holos 2024-11-24 21:23:16 +00:00
okx-code
b870d9a62f Merge pull request #606 from kickylol/acidblock-improvements 
Acidblock improvements
 2024-11-24 21:18:17 +00:00
okx-code
36b583801f update holos 2024-11-24 19:40:07 +00:00
okx-code
d0b06a8525 update to 1.21.3 2024-11-24 18:46:28 +00:00
okx-code
267eb2a51e Merge branch 'hologram' into v1.21.3 
# Conflicts:
#	plugins/citadel-paper/src/main/java/vg/civcraft/mc/citadel/Citadel.java
 2024-11-24 17:55:34 +00:00
okx-code
e4182132a2 fix min position radius 2024-11-23 15:25:16 +00:00
okx-code
f2bf286a46 instant break logs 2024-11-18 18:08:34 +00:00
okx-code
1ad4e0c6e5 cleanup 2024-11-18 00:48:59 +00:00
okx-code
5b9d00b430 fix 2024-11-17 23:31:18 +00:00
okx-code
9bfab3a1e1 fix 2024-11-17 23:27:49 +00:00
okx-code
998d6f4914 typo 2024-11-17 22:48:10 +00:00
okx-code
388655ef86 don't bind meteoric 2024-11-17 22:12:05 +00:00
okx-code
a65378e832 fix get chunks 2024-11-17 19:28:20 +00:00
okx-code
64282a426d add some blocks 2024-11-17 19:23:00 +00:00
okx-code
e21bc9e7da patch axes, kb1 swords and add kit applier notifier 2024-11-17 19:17:29 +00:00
okx-code
59988499e2 add kb1 2024-11-17 18:08:40 +00:00
okx-code
8fdb520620 add kb1 2024-11-17 05:00:50 +00:00
okx-code
1390579a27 update desc 2024-11-17 05:00:50 +00:00
okx-code
a35efa0875 reduce axe 2024-11-17 05:00:50 +00:00
okx-code
34aca2a227 ping max vein 2024-11-17 05:00:50 +00:00
okx-code
7d6e812e0e add doors 2024-11-17 05:00:50 +00:00
okx-code
9f8c23ca78 fix statement 2024-11-16 17:36:50 +00:00
okx-code
242a6f382e fix infusions 2024-11-16 17:14:14 +00:00
okx-code
5efedf180f fix recipe 2024-11-16 17:12:20 +00:00
okx-code
34f6bc6353 disable crossbow 2024-11-16 15:47:16 +00:00
okx-code
f5e57226fe fix npe 2024-11-16 14:16:51 +00:00
okx-code
d3cdb96451 copper trapdoors 2024-11-16 14:15:13 +00:00
okx-code
f72a5e1e20 Merge branch 'swm2' into heliodor 
# Conflicts:
#	ansible/variables/settings.yml
 2024-11-16 12:01:59 +00:00
okx-code
631534b7be fixes 2024-11-16 11:53:33 +00:00
okx-code
4c6aa5f176 broadcast death 2024-11-16 11:31:40 +00:00
okx-code
05b23547ec add other blocks 2024-11-15 23:22:23 +00:00
okx-code
c76428fc56 add message timeout 2024-11-15 23:06:53 +00:00
okx-code
3bc606edd3 move stuff 2024-11-15 22:47:43 +00:00
okx-code
e88488664b fix i/o 2024-11-15 22:42:50 +00:00
okx-code
5eee9a5f43 clean config 2024-11-15 22:03:28 +00:00
okx-code
6bc8e140ea Add disable option 2024-11-15 21:57:21 +00:00
okx-code
263fc3627c Merge branch 'main' into heliodor 
# Conflicts:
#	ansible/build.gradle.kts
#	ansible/files/paper-config/plugins/FactoryMod/config.yml
#	containers/provisioning/mariadb/docker-entrypoint-initdb.d/0100_create_databases.sql
#	plugins/finale-paper/src/main/java/com/github/maxopoly/finale/ConfigParser.java
#	plugins/finale-paper/src/main/java/com/github/maxopoly/finale/Finale.java
#	plugins/finale-paper/src/main/java/com/github/maxopoly/finale/listeners/WeaponModificationListener.java
#	plugins/finale-paper/src/main/resources/config.yml
#	plugins/heliodor-paper/src/main/java/net/civmc/heliodor/HeliodorPlugin.java
#	plugins/heliodor-paper/src/main/java/net/civmc/heliodor/HeliodorRecipeGiver.java
#	plugins/heliodor-paper/src/main/resources/config.yml
#	plugins/heliodor-paper/src/main/resources/plugin.yml
#	settings.gradle.kts
 2024-11-15 21:51:36 +00:00
okx-code
1a0c8c8aa9 Merge branch 'main' into heliodor 2024-11-15 18:57:03 +00:00
okx-code
33b287a7f1 change 2024-11-15 18:46:14 +00:00
okx-code
cbc3ebb71b change 2024-11-15 18:46:14 +00:00
okx-code
fcb12fb329 fix sql 2024-11-15 18:41:00 +00:00
okx-code
4990d488c3 fix sql 2024-11-15 18:41:00 +00:00
okx-code
42b560cc03 Merge branch 'main' into swm 2024-11-15 17:58:54 +00:00
okx-code
67ef12bffc Merge branch 'main' into swm 2024-11-15 17:58:54 +00:00
kickylol
8bca507bf2 update warning to ignore acid on same group 2024-11-15 03:16:53 -03:30
okx-code
011f802743 Merge branch 'heliodor2' into swm 2024-11-15 05:55:47 +00:00
okx-code
11842c2dd8 Merge branch 'heliodor2' into swm 2024-11-15 05:55:47 +00:00
okx-code
7fbd3662e2 cobwebs 2024-11-15 05:55:43 +00:00
okx-code
70fe0d481d cobwebs 2024-11-15 05:55:43 +00:00