Tim203 5ad495ce97 Merge remote-tracking branch 'origin/master' into floodgate-2.0 ... # Conflicts: # common/src/main/java/org/geysermc/common/window/CustomFormBuilder.java # common/src/main/java/org/geysermc/common/window/CustomFormWindow.java # common/src/main/java/org/geysermc/common/window/FormWindow.java # common/src/main/java/org/geysermc/common/window/ModalFormWindow.java # common/src/main/java/org/geysermc/common/window/SimpleFormWindow.java # common/src/main/java/org/geysermc/common/window/button/FormButton.java # common/src/main/java/org/geysermc/common/window/button/FormImage.java # common/src/main/java/org/geysermc/common/window/component/DropdownComponent.java # common/src/main/java/org/geysermc/common/window/component/InputComponent.java # common/src/main/java/org/geysermc/common/window/component/SliderComponent.java # common/src/main/java/org/geysermc/common/window/component/StepSliderComponent.java # common/src/main/java/org/geysermc/common/window/component/ToggleComponent.java # common/src/main/java/org/geysermc/common/window/response/CustomFormResponse.java # common/src/main/java/org/geysermc/common/window/response/ModalFormResponse.java # common/src/main/java/org/geysermc/common/window/response/SimpleFormResponse.java # common/src/main/java/org/geysermc/floodgate/util/EncryptionUtil.java # connector/src/main/java/org/geysermc/connector/network/session/cache/WindowCache.java		2021-01-04 13:37:58 +01:00
..
main	Merge remote-tracking branch 'origin/master' into floodgate-2.0	2021-01-04 13:37:58 +01:00
test/java/org/geysermc/connector/network/translators/chat	Update copyright to 2021 (#1772)	2021-01-01 10:10:36 -05:00