Commit Graph

1154 Commits

Author SHA1 Message Date
okx-code
6f09ac9089 make queue work 2026-05-14 05:54:37 +01:00
okx-code
20e32955fd wip 2026-05-14 03:28:23 +01:00
okx-code
1bb6643dbf wip 2026-05-13 23:39:41 +01:00
okx-code
ea006b8bfb add flight computer 2026-05-13 03:30:39 +01:00
okx-code
538f76a282 add zorweth plugin 2026-05-13 03:12:10 +01:00
okx-code
ea2a41b0de add rocket recipe 2026-05-13 03:02:31 +01:00
okx-code
9f546cafd3 wip 2026-05-13 02:36:08 +01:00
okx-code
b6e4eac27d add auto reconnection to paper + move join group notifications to proxy + improve create group messages 2026-05-08 02:58:46 +01:00
okx-code
d27b80ffec fix compactor running when empty 2026-04-06 21:31:27 +01:00
okx-code
41f264b4d8 fix stonecutters accepting compacted items 2026-02-22 16:38:54 +00:00
okx-code
48450c2ff6 fix redstone activating factories when they are full 2026-02-22 16:38:05 +00:00
okx-code
f8a10f5e86 Merge branch 'main'
# Conflicts:
#	ansible/templates/stacks/minecraft.yml.j2
#	plugins/citadel-paper/src/main/java/vg/civcraft/mc/citadel/listener/BlockListener.java
#	plugins/citadel-paper/src/main/java/vg/civcraft/mc/citadel/listener/EntityListener.java
2026-02-18 00:11:21 +00:00
okx-code
5c0d7fbd4a fix decompacting and production recipes not stopping when full 2026-02-16 14:01:44 +00:00
okx-code
79c80b8f6f handle wind charges properly 2026-02-04 23:30:32 +00:00
okx-code
2cd53d4e5b add copper stuff 2025-12-11 04:26:19 +00:00
okx-code
541ad987da Merge remote-tracking branch 'husky/name-api' into update
# Conflicts:
#	plugins/namelayer-paper/src/main/java/vg/civcraft/mc/namelayer/command/commands/CreateGroup.java
#	plugins/namelayer-paper/src/main/java/vg/civcraft/mc/namelayer/listeners/PlayerListener.java
2025-11-01 23:32:47 +00:00
okx-code
897f790602 Merge remote-tracking branch 'crazygrape/add-fm-barrels' into name 2025-10-12 20:40:02 +01:00
Husky
3735707c60 rename NameAPI to NameLayerAPI 2025-10-10 14:55:22 -04:00
CrazyGrape
2ad3d1b337 add barrels as factorymod storage type, fix bug where factory runs without a designated output 2025-10-10 06:56:38 -04:00
CrazyGrape
f64790f61f fix label logic of 'random output' factory recipes 2025-10-08 03:20:48 +01:00
Husky
744182a004 plugins should also use version catalogue 2025-09-10 22:43:15 -04:00
okx-code
6c24cde085 update plugins 2025-08-04 00:24:43 +01:00
okx-code
5be7039a65 fix refill recipe 2025-05-22 00:40:20 +01:00
okx-code
34735debdf Revert "Reapply "revert""
This reverts commit f51f859b8d.
2025-04-21 22:18:46 +01:00
okx-code
f51f859b8d Reapply "revert"
This reverts commit bec45e69a5.
2025-04-14 20:11:14 +01:00
okx-code
bec45e69a5 Revert "revert"
This reverts commit 9a9f7c06a9.
2025-04-14 19:59:32 +01:00
okx-code
9a9f7c06a9 revert 2025-04-14 19:24:37 +01:00
MrJeremyFisher
e326572c4e Cleanup imports 2025-01-10 11:22:09 -05:00
MrJeremyFisher
9e22de5be9 Mostly fix JSON notes 2025-01-10 11:21:12 -05:00
MrJeremyFisher
acdcd797f3 Oops 2025-01-06 18:42:17 -05:00
MrJeremyFisher
d7c0b1db10 Fix wordbank (not plates) 2025-01-06 18:39:34 -05:00
okx-code
ba04e13cca shift left click -> shift right click 2025-01-05 16:57:50 +00:00
okx-code
59ec869ade Merge pull request #565 from MrJeremyFisher/fuel-IO-fix
Change fuel button to left shift
2025-01-05 16:56:46 +00:00
Alexander
4fc0b4ad58 Defers paper versioning to libs.versions.toml 2025-01-04 10:46:27 -05:00
MrJeremyFisher
575ae0ea2b Requested changes 2024-12-16 16:38:30 -05:00
Jeremy Favro
206c541bc1 Merge branch 'CivMC:main' into fuel-IO-fix 2024-12-16 16:05:55 -05:00
okx-code
ab145a621d Reapply "update to 1.21.3"
This reverts commit a2e1c7dd1b.
2024-12-15 01:48:34 +00:00
okx-code
9f282aaa82 add custom item support to /item 2024-12-09 10:22:29 +00:00
okx-code
5efedf180f fix recipe 2024-11-16 17:12:20 +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
e88488664b fix i/o 2024-11-15 22:42:50 +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
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
okx-code
ed0d9b530c Merge branch 'heliodor2' into swm 2024-11-15 05:55:01 +00:00
okx-code
fd566fdd51 Merge branch 'heliodor2' into swm 2024-11-15 05:55:01 +00:00
okx-code
669d605cea Make /item not case sensitive 2024-11-14 01:39:54 +00:00
okx-code
9579054738 Make /item not case sensitive 2024-11-14 01:39:54 +00:00
okx-code
1e82ff1b61 remove reset upgrades recipe 2024-11-14 01:39:14 +00:00