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,056 Commits 31 Branches 181 Tags
1be7add5bb40d51189cbf7d9a3359a600282e41f
Commit Graph

8859 Commits

Author SHA1 Message Date
okx-code
1be7add5bb Reapply "Merge pull request #656 from CivMC/feature/pearl-health-value" 
This reverts commit 08c7abf423.
 2024-11-30 16:42:47 +00:00
okx-code
6462f0b5a7 Merge branch 'update' 2024-11-29 20:59:29 +00:00
okx-code
584fffa156 Revert "update holos" 
This reverts commit 36b583801f.
 2024-11-28 22:41:27 +00:00
okx-code
f84ac38c9b Revert "update holos" 
This reverts commit d44b486d9a.
 2024-11-28 22:41:27 +00:00
okx-code
a2e1c7dd1b Revert "update to 1.21.3" 
This reverts commit d0b06a8525.
 2024-11-28 22:24:22 +00:00
okx-code
199eb0ea32 prevent enchanting 2024-11-25 19:00:25 +00:00
okx-code
08c7abf423 Revert "Merge pull request #656 from CivMC/feature/pearl-health-value" 
This reverts commit 1e9dfc832f, reversing
changes made to e4182132a2.
 2024-11-25 18:48:34 +00:00
okx-code
cb2220c7b1 Make reinforcement damage also deal tool damage 2024-11-24 23:52:08 +00:00
okx-code
d42a577584 add furnace to meteoric iron axe 2024-11-24 23:19:55 +00:00
RedDevel2
52d18eed5e Merge pull request #665 from CivMC/feature/ops-bypass-pearls 
Merge change into branch
 2024-11-25 00:01:39 +01:00
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
RedDevel2
1eae9fc4c3 Merge pull request #657 from CivMC/feature/ops-bypass-pearls 
Allow ops to bypass pearled alt restrictions
 2024-11-24 23:51:54 +01:00
RedDevel2
1e9dfc832f Merge pull request #656 from CivMC/feature/pearl-health-value 
Show pearl health value instead of percent
 2024-11-24 23:51:34 +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