1
0
forked from Clones/Controlify

Merge branch 'feature/radial-menu' into 1.20.x/dev

# Conflicts:
#	src/main/java/dev/isxander/controlify/config/ControlifyConfig.java
#	src/main/java/dev/isxander/controlify/controller/ControllerConfig.java
#	src/main/resources/assets/controlify/lang/en_us.json
This commit is contained in:
isXander
2023-08-07 22:25:56 +01:00
18 changed files with 858 additions and 24 deletions

View File

@ -113,6 +113,9 @@
"controlify.gui.test_vibration": "Test Vibration",
"controlify.gui.test_vibration.tooltip": "Test the vibration of your controller.",
"controlify.gui.radial_menu": "Radial Menu",
"controlify.gui.radial_menu.tooltip": "Open up the radial menu to configure what each button does.",
"controlify.gui.radial_menu.btn_text": "CONFIGURE",
"controlify.gui.group.controls": "Controls",
"controlify.gui.group.controls.tooltip": "Adjust the controller controls.",
"controlify.gui.bind_input_awaiting": "Press any button",
@ -218,6 +221,7 @@
"controlify.binding.controlify.pick_block": "Pick Block",
"controlify.binding.controlify.toggle_hud_visibility": "Toggle HUD Visibility",
"controlify.binding.controlify.show_player_list": "Show Player List",
"controlify.binding.controlify.radial_menu": "Radial Menu",
"controlify.binding.controlify.vmouse_move_up": "VMouse Move Up",
"controlify.binding.controlify.vmouse_move_down": "VMouse Move Down",
"controlify.binding.controlify.vmouse_move_left": "VMouse Move Left",
@ -286,6 +290,8 @@
"controlify.calibration.later": "Maybe Later",
"controlify.calibration.later.tooltip": "You must calibrate to use the controller. Pressing this will deactivate the controller and you will have to use it again to calibrate.",
"controlify.radial_menu.configure_hint": "Configure actions in the controller settings.",
"controlify.controller_submission.title": "Unknown Controller Submission",
"controlify.controller_submission.message": "Please submit some of your controller info to Controlify's database to get it added in a future update.\n\nControlify sends the following information:\n- Your controller's vendor & product IDs\n- Your controller's GUID\n- The name of your controller (in the box below)\n- The version of Controlify you are currently on\n\nThis is completely anonymous and doesn't store any of your personal or account information.",
"controlify.controller_submission.operational_checkbox": "Does your controller work with Controlify?",

Binary file not shown.

After

Width:  |  Height:  |  Size: 261 B

View File

@ -27,6 +27,7 @@
"core.MouseHandlerMixin",
"feature.accessibility.LocalPlayerMixin",
"feature.autoswitch.ToastComponentAccessor",
"feature.bind.GuiMixin",
"feature.bind.KeyMappingAccessor",
"feature.bind.KeyMappingMixin",
"feature.bind.ToggleKeyMappingAccessor",
@ -52,6 +53,7 @@
"feature.rumble.levelevents.LevelRendererMixin",
"feature.rumble.useitem.LivingEntityMixin",
"feature.rumble.useitem.LocalPlayerMixin",
"feature.screenop.ContainerEventHandlerMixin",
"feature.screenop.GameRendererMixin",
"feature.screenop.MinecraftMixin",
"feature.screenop.ScreenAccessor",