GiantLuigi4 ec904c199e Merge remote-tracking branch 'origin/1.20' into 1.20 ... # Conflicts: # src/main/java/net/montoyo/wd/block/ScreenBlock.java # src/main/java/net/montoyo/wd/client/ClientProxy.java # src/main/java/net/montoyo/wd/client/gui/GuiKeyboard.java # src/main/java/net/montoyo/wd/client/gui/GuiScreenConfig.java # src/main/java/net/montoyo/wd/client/renderers/ScreenRenderer.java # src/main/java/net/montoyo/wd/controls/builtin/ManageRightsAndUpdgradesControl.java # src/main/java/net/montoyo/wd/data/ScreenConfigData.java # src/main/java/net/montoyo/wd/entity/AbstractInterfaceBlockEntity.java # src/main/java/net/montoyo/wd/entity/KeyboardBlockEntity.java # src/main/java/net/montoyo/wd/entity/RedstoneControlBlockEntity.java # src/main/java/net/montoyo/wd/entity/RemoteControlBlockEntity.java # src/main/java/net/montoyo/wd/entity/ScreenBlockEntity.java # src/main/java/net/montoyo/wd/item/ItemLaserPointer.java # src/main/java/net/montoyo/wd/item/ItemLinker.java # src/main/java/net/montoyo/wd/item/ItemOwnershipThief.java # src/main/java/net/montoyo/wd/item/ItemScreenConfigurator.java # src/main/java/net/montoyo/wd/net/client_bound/S2CMessageAddScreen.java		2023-11-22 21:54:43 -05:00
..
net/montoyo/wd	Merge remote-tracking branch 'origin/1.20' into 1.20	2023-11-22 21:54:43 -05:00