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
10,589 Commits 31 Branches 181 Tags
a3400203a4e9f1a56d38cba7c628fb9456f4f572
Commit Graph

10589 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
RedDevel2
a3400203a4 Merge pull request #526 from CivMC/Emotes 
Fix Emotes
v2.0.1 		2024-05-13 10:08:42 +02:00
RedDevel2
2317ea2dad Merge pull request #511 from CivMC/RedDevel2-patch-1 
Fix Mangrove/cherry saplings
 2024-05-13 01:49:06 +02:00
RedDevel2
ef344b8b82 Merge pull request #525 from CivMC/main 
Update branch
 2024-05-13 01:15:24 +02:00
AngrySoundTech
2f5c88013f Merge pull request #524 from CivMC/feature/missing-plugins 
Add CastleGates and Donum
 2024-05-12 19:10:48 -04:00
RedDevel2
068ac6ef43 Update test variable 2024-05-13 01:08:47 +02:00
AngrySoundTech
fd4952cab2 Add Castlegates to the monorepo 2024-05-12 18:16:49 -04:00
AngrySoundTech
e8f5ece8b4 Merge remote-tracking branch 'cg/master' into feature/missing-plugins 2024-05-12 18:09:05 -04:00
AngrySoundTech
8a1c11a62e Add Donum to monorepo 2024-05-12 17:49:39 -04:00
AngrySoundTech
59dd388ecb Merge remote-tracking branch 'd/master' 2024-05-12 17:31:25 -04:00
AngrySoundTech
fcab0b9eef Merge pull request #497 from CivMC/feature/always-build-plugins 
Build plugins from source for ansible deployments
 2024-05-12 14:04:18 -04:00
AngrySoundTech
0ce59eb6bc Remove civdocker version 2024-05-12 13:20:31 -04:00
AngrySoundTech
bf2661ac97 Fix gradle action name 2024-05-12 13:18:06 -04:00
AngrySoundTech
eb84e5e8b9 relative files directory 2024-05-12 13:15:17 -04:00
AngrySoundTech
e832b759b4 Update actions gradle 2024-05-12 13:13:26 -04:00
AngrySoundTech
12faf2e7c5 Fix copy source 2024-05-12 13:04:57 -04:00
AngrySoundTech
5048283e41 Merge branch 'main' into feature/always-build-plugins 2024-05-12 12:41:56 -04:00
RedDevel2
0b4e3d9a0c Add config file 2024-05-12 16:51:37 +02:00
RedDevel2
0e49a2d85b update variable 2024-05-12 16:39:56 +02:00
RedDevel2
c71dd1fedc Fix emotes 2024-05-12 16:39:23 +02:00
RedDevel2
dff75afbb7 Fix Mangrove/cherry saplings 
This fixes Mangrove and Cherry saplings being seen as Warped and crimson fungus after restart.
 2024-05-12 15:58:29 +02:00
RedDevel2
39c47eaa46 Merge pull request #506 from CivMC/tabfix 
fix bonemeal
 2024-05-11 03:23:04 +02:00
okx-code
ea3c1895a6 update settings.yml 2024-05-11 02:15:11 +01:00
okx-code
d3463c079d update torchflower 2024-05-11 01:57:02 +01:00
okx-code
117bbdc31a Merge remote-tracking branch 'origin/main' into tabfix 2024-05-11 01:46:31 +01:00
okx-code
8625702729 fix bonemeal 2024-05-11 01:44:23 +01:00
okx-code
0b5a6e2dc6 Merge pull request #505 from CivMC/tabfix 
add netherite upgrade
 2024-05-11 01:13:25 +01:00
okx-code
5d0080f941 Merge branch 'main' into tabfix 2024-05-11 01:10:42 +01:00
okx-code
648f32b7d6 Update settings.yml 2024-05-11 01:10:06 +01:00
okx-code
2e680d32e6 fix name 2024-05-11 00:59:58 +01:00
okx-code
99aa0716ff Update settings.yml 2024-05-11 00:51:35 +01:00
okx-code
4d971a3c92 test 2024-05-11 00:44:14 +01:00
okx-code
a54f9c87b9 Merge pull request #504 from CivMC/tabfix 
update jukealert
 2024-05-10 20:03:11 +01:00
okx-code
954050054d update jukealert 2024-05-10 20:02:24 +01:00
okx-code
20120f32ac Merge pull request #503 from CivMC/tabfix 
Update protocollib
 2024-05-10 19:32:00 +01:00
okx-code
f89c63f1d4 Update protocollib 2024-05-10 19:29:35 +01:00
okx-code
517b50fd7b Merge pull request #502 from CivMC/tabfix 
update namecolors and civchat and protocollib
 2024-05-10 19:22:33 +01:00
okx-code
4fbe7f6c77 update namecolors and civchat and protocollib 2024-05-10 19:21:45 +01:00
okx-code
5e4d2daea6 Merge pull request #501 from CivMC/tabfix 
update kirabukkitgateway
 2024-05-10 18:56:53 +01:00
okx-code
9cb24b1235 update kirabukkitgateway 2024-05-10 18:56:31 +01:00
okx-code
f05bad6977 Merge pull request #500 from CivMC/tabfix 
fix tab
 2024-05-10 18:25:22 +01:00
okx-code
bcf3d9e5dc fix tab 2024-05-10 18:24:58 +01:00
RedDevel2
35148d6988 Merge pull request #498 from CivMC/RedDevel2-patch-1 
Update variables
 2024-05-10 18:10:11 +02:00
RedDevel2
b0345b4d56 Update variables 2024-05-10 17:22:12 +02:00
RedDevel2
50e8681e62 Merge pull request #324 from CivMC/mc/1.20 
1.20 update
v2.0.0 		2024-05-10 17:17:42 +02:00
RedDevel2
ac975b3425 Try rebuilding plugins 2024-05-10 17:01:52 +02:00
RedDevel2
38ae2bbc8c reEnable 2024-05-10 16:20:12 +02:00
RedDevel2
93f51f14be revert fossil change 2024-05-10 16:08:36 +02:00
RedDevel2
0335011f32 Test 2024-05-10 15:37:47 +02:00
AngrySoundTech
a0be497e92 revert ansible user name 2024-05-09 18:27:11 -04:00
AngrySoundTech
9a2172f27f Update docker compose configuration 2024-05-09 18:20:00 -04:00