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
9,207 Commits 31 Branches 181 Tags
9bba4683d46e37df7a5253ff1432af8a4e3e2f4e
Commit Graph

7801 Commits

Author SHA1 Message Date
okx-code
9bba4683d4 Fix RealisticBiomes plugin name 2024-02-23 22:05:30 +00:00
okx-code
e340c29112 Merge branch 'essenceglue' into mc/1.20 2024-02-23 22:03:47 +00:00
okx-code
6f7817d968 fix name 2024-02-23 21:58:50 +00:00
okx-code
c85c33c820 Merge branch 'mc/exilepearl-1.20' into mc/1.20 2024-02-23 01:45:22 +00:00
okx-code
682a18c48b proxy method properly 2024-02-23 01:45:05 +00:00
okx-code
86b3bd1b26 Update KiraBukkitGateway to 1.20 2024-02-23 01:41:34 +00:00
okx-code
c9b0856f55 Update NameColors to 1.20 2024-02-23 01:38:26 +00:00
okx-code
f618d501d4 Update RailSwitch to 1.20 2024-02-23 01:37:54 +00:00
okx-code
ef9c537a90 Update HiddenOre to 1.20 2024-02-23 01:35:45 +00:00
okx-code
5171271f5b Update EssenceGlue to 1.20 2024-02-23 01:31:15 +00:00
okx-code
45061c84b8 Update CivDuties to 1.20 2024-02-23 01:30:19 +00:00
okx-code
e0d5901412 Merge branch 'railswitch' into mc/1.20 
# Conflicts:
#	settings.gradle.kts
 2024-02-23 01:27:46 +00:00
okx-code
5fcff41bcd Merge branch 'namecolors' into mc/1.20 
# Conflicts:
#	settings.gradle.kts
 2024-02-23 01:27:34 +00:00
okx-code
ec7da3405c Merge branch 'kirabukkitgateway' into mc/1.20 
# Conflicts:
#	settings.gradle.kts
 2024-02-23 01:27:25 +00:00
okx-code
0693cca092 Merge branch 'hiddenore' into mc/1.20 
# Conflicts:
#	settings.gradle.kts
 2024-02-23 01:27:14 +00:00
okx-code
ae0352b5d2 Merge branch 'essenceglue' into mc/1.20 
# Conflicts:
#	settings.gradle.kts
 2024-02-23 01:26:39 +00:00
okx-code
0e1d6b5327 Merge branch 'civduties' into mc/1.20 2024-02-23 01:26:19 +00:00
okx-code
66e00808ae Update CopperRail to 1.20 2024-02-23 01:25:14 +00:00
okx-code
a1b861f0d1 Merge branch 'main' into mc/1.20 
# Conflicts:
#	settings.gradle.kts
 2024-02-23 01:15:30 +00:00
okx-code
eb3d4939c2 Add KiraBukkitGateway 2024-02-22 23:32:33 +00:00
okx-code
ffd0abbaaf Add NameColors 2024-02-22 22:30:54 +00:00
okx-code
8f7bd389b7 Add EsssenceGlue 2024-02-22 22:21:05 +00:00
okx-code
b980ad8917 Add CivDuties 2024-02-22 22:08:55 +00:00
okx-code
6a915e86b7 Add RailSwitch 2024-02-22 21:37:06 +00:00
okx-code
2173e8541e Add HiddenOre 2024-02-22 21:31:00 +00:00
okx-code
50626e1e2c Merge pull request #310 from MrJeremyFisher/mc/bastion-1.20 
Bastion 1.20
 2024-02-22 16:18:20 +00:00
MrJeremyFisher
10543b0450 1.20.4 2024-02-22 10:47:07 -05:00
MrJeremyFisher
457a080a5a 1.20.4 2024-02-22 10:40:25 -05:00
MrJeremyFisher
56d8036799 1.20.4 2024-02-22 10:19:34 -05:00
RedDevel2
f929bcce63 Merge pull request #273 from CivMC/transport 
Add BetterRails, FasterHorses, CopperRail, and miscellaneous things
 2024-02-22 15:12:04 +01:00
RedDevel2
0eceee6ab3 Merge pull request #275 from CivMC/jalist-lore-lag 
Optimise snitch GUI
 2024-02-22 13:35:41 +01:00
okx-code
c29be1d578 Update FactoryMod to 1.20 2024-02-22 02:57:52 +00:00
AngrySoundTech
bb6c37647e Merge branch 'main' into finale 2024-02-21 21:57:08 -05:00
okx-code
c8cb717c88 Merge branch 'factorymod' into mc/1.20 
# Conflicts:
#	settings.gradle.kts
 2024-02-22 02:52:33 +00:00
MrJeremyFisher
f79fdfbd15 1.20.4 2024-02-22 02:49:52 +00:00
okx-code
2abb502e4a Update CivChat2 to 1.20 2024-02-22 02:44:51 +00:00
okx-code
8d23e72982 Update ItemExchange to 1.20 2024-02-22 02:44:51 +00:00
okx-code
7e6a23500d Update JukeAlert to 1.20 2024-02-22 02:44:51 +00:00
okx-code
ddacd85aab Update RandomSpawn to 1.20 2024-02-22 02:44:51 +00:00
okx-code
0aac6feb84 Update finale to 1.20 2024-02-22 02:44:50 +00:00
okx-code
1cf72080a8 Merge branch 'finale' into mc/1.20 2024-02-22 02:40:32 +00:00
okx-code
21a6a66229 Add Finale 2024-02-22 02:35:06 +00:00
okx-code
7c909b6945 Add FactoryMod 2024-02-22 02:29:14 +00:00
okx-code
66f891b6b0 fix bad plugin name 2024-02-22 00:49:41 +00:00
okx-code
5bc7e3bdf9 fix bad plugin name 2024-02-22 00:49:09 +00:00
okx-code
0bbbefa448 fix compilation errors 2024-02-22 00:34:44 +00:00
okx-code
e792c54b72 Merge pull request #279 from MrJeremyFisher/mc/sah-1.20 
SimpleAdminHacks 1.20.4
 2024-02-22 00:34:28 +00:00
MrJeremyFisher
bfb19722f6 Add saplings 2024-02-21 19:32:41 -05:00
RedDevel2
954d9cde94 Merge pull request #256 from Tuomasz/fix-show-previous-page 
Fix show previous page
 2024-02-22 01:03:18 +01:00
RedDevel2
1bf808987f Merge pull request #255 from Tuomasz/fix-show-next-page 
Fix show next page
 2024-02-22 01:03:09 +01:00