Skip to content

Commit

Permalink
Correccion de errores generados por conflicto GIT
Browse files Browse the repository at this point in the history
  • Loading branch information
MarioGabIFP authored and MarioGabIFP committed Mar 24, 2022
1 parent 8592ef6 commit b09c3dc
Show file tree
Hide file tree
Showing 10 changed files with 134 additions and 25 deletions.
106 changes: 106 additions & 0 deletions .metadata/.log
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4421,3 +4421,109 @@ user global configuration and to define the default location to store repositori
not correct please set the HOME environment variable and restart Eclipse. Otherwise Git for Windows and
EGit might behave differently since they see different configuration options.
This warning can be switched off on the Team > Git > Confirmations and Warnings preference page.
!SESSION 2022-03-24 10:10:47.281 -----------------------------------------------
eclipse.buildId=4.23.0.I20220308-0310
java.version=16.0.1
java.vendor=Oracle Corporation
BootLoader constants: OS=win32, ARCH=x86_64, WS=win32, NL=es_ES
Framework arguments: -product org.eclipse.epp.package.java.product
Command-line arguments: -os win32 -ws win32 -arch x86_64 -product org.eclipse.epp.package.java.product

!ENTRY org.eclipse.jface 2 0 2022-03-24 10:10:55.821
!MESSAGE Keybinding conflicts occurred. They may interfere with normal accelerator operation.
!SUBENTRY 1 org.eclipse.jface 2 0 2022-03-24 10:10:55.821
!MESSAGE A conflict occurred for CTRL+SHIFT+T:
Binding(CTRL+SHIFT+T,
ParameterizedCommand(Command(org.eclipse.lsp4e.symbolinworkspace,Go to Symbol in Workspace,
,
Category(org.eclipse.lsp4e.category,Language Servers,null,true),
org.eclipse.ui.internal.WorkbenchHandlerServiceHandler@74eab077,
,,true),null),
org.eclipse.ui.defaultAcceleratorConfiguration,
org.eclipse.ui.contexts.window,,,system)
Binding(CTRL+SHIFT+T,
ParameterizedCommand(Command(org.eclipse.jdt.ui.navigate.open.type,Open Type,
Open a type in a Java editor,
Category(org.eclipse.ui.category.navigate,Navigate,null,true),
org.eclipse.ui.internal.WorkbenchHandlerServiceHandler@3063be68,
,,true),null),
org.eclipse.ui.defaultAcceleratorConfiguration,
org.eclipse.ui.contexts.window,,,system)
!SUBENTRY 1 org.eclipse.jface 2 0 2022-03-24 10:10:55.821
!MESSAGE A conflict occurred for ALT+SHIFT+R:
Binding(ALT+SHIFT+R,
ParameterizedCommand(Command(org.eclipse.ui.edit.rename,Rename,
Rename the selected item,
Category(org.eclipse.ui.category.file,File,null,true),
org.eclipse.ui.internal.WorkbenchHandlerServiceHandler@3a3bc0da,
,,true),null),
org.eclipse.ui.defaultAcceleratorConfiguration,
org.eclipse.ui.contexts.window,,,system)
Binding(ALT+SHIFT+R,
ParameterizedCommand(Command(org.eclipse.jdt.ui.edit.text.java.rename.element,Rename - Refactoring ,
Rename the selected element,
Category(org.eclipse.jdt.ui.category.refactoring,Refactor - Java,Java Refactoring Actions,true),
org.eclipse.ui.internal.WorkbenchHandlerServiceHandler@2d2f09a4,
,,true),null),
org.eclipse.ui.defaultAcceleratorConfiguration,
org.eclipse.ui.contexts.window,,,system)

!ENTRY org.eclipse.egit.ui 2 0 2022-03-24 10:10:59.504
!MESSAGE Warning: The environment variable HOME is not set. The following directory will be used to store the Git
user global configuration and to define the default location to store repositories: 'C:\Users\mario'. If this is
not correct please set the HOME environment variable and restart Eclipse. Otherwise Git for Windows and
EGit might behave differently since they see different configuration options.
This warning can be switched off on the Team > Git > Confirmations and Warnings preference page.
!SESSION 2022-03-24 10:19:53.472 -----------------------------------------------
eclipse.buildId=4.23.0.I20220308-0310
java.version=16.0.1
java.vendor=Oracle Corporation
BootLoader constants: OS=win32, ARCH=x86_64, WS=win32, NL=es_ES
Framework arguments: -product org.eclipse.epp.package.java.product
Command-line arguments: -os win32 -ws win32 -arch x86_64 -product org.eclipse.epp.package.java.product

!ENTRY org.eclipse.jface 2 0 2022-03-24 10:20:01.676
!MESSAGE Keybinding conflicts occurred. They may interfere with normal accelerator operation.
!SUBENTRY 1 org.eclipse.jface 2 0 2022-03-24 10:20:01.677
!MESSAGE A conflict occurred for CTRL+SHIFT+T:
Binding(CTRL+SHIFT+T,
ParameterizedCommand(Command(org.eclipse.lsp4e.symbolinworkspace,Go to Symbol in Workspace,
,
Category(org.eclipse.lsp4e.category,Language Servers,null,true),
org.eclipse.ui.internal.WorkbenchHandlerServiceHandler@215a0264,
,,true),null),
org.eclipse.ui.defaultAcceleratorConfiguration,
org.eclipse.ui.contexts.window,,,system)
Binding(CTRL+SHIFT+T,
ParameterizedCommand(Command(org.eclipse.jdt.ui.navigate.open.type,Open Type,
Open a type in a Java editor,
Category(org.eclipse.ui.category.navigate,Navigate,null,true),
org.eclipse.ui.internal.WorkbenchHandlerServiceHandler@45832b85,
,,true),null),
org.eclipse.ui.defaultAcceleratorConfiguration,
org.eclipse.ui.contexts.window,,,system)
!SUBENTRY 1 org.eclipse.jface 2 0 2022-03-24 10:20:01.677
!MESSAGE A conflict occurred for ALT+SHIFT+R:
Binding(ALT+SHIFT+R,
ParameterizedCommand(Command(org.eclipse.ui.edit.rename,Rename,
Rename the selected item,
Category(org.eclipse.ui.category.file,File,null,true),
org.eclipse.ui.internal.WorkbenchHandlerServiceHandler@103478b8,
,,true),null),
org.eclipse.ui.defaultAcceleratorConfiguration,
org.eclipse.ui.contexts.window,,,system)
Binding(ALT+SHIFT+R,
ParameterizedCommand(Command(org.eclipse.jdt.ui.edit.text.java.rename.element,Rename - Refactoring ,
Rename the selected element,
Category(org.eclipse.jdt.ui.category.refactoring,Refactor - Java,Java Refactoring Actions,true),
org.eclipse.ui.internal.WorkbenchHandlerServiceHandler@270f7b4d,
,,true),null),
org.eclipse.ui.defaultAcceleratorConfiguration,
org.eclipse.ui.contexts.window,,,system)

!ENTRY org.eclipse.egit.ui 2 0 2022-03-24 10:20:03.841
!MESSAGE Warning: The environment variable HOME is not set. The following directory will be used to store the Git
user global configuration and to define the default location to store repositories: 'C:\Users\mario'. If this is
not correct please set the HOME environment variable and restart Eclipse. Otherwise Git for Windows and
EGit might behave differently since they see different configuration options.
This warning can be switched off on the Team > Git > Confirmations and Warnings preference page.
Binary file modified .metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
View file
Binary file not shown.
36 changes: 18 additions & 18 deletions .metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,19 +73,20 @@
<tags>persp.newWizSC:org.eclipse.jdt.junit.wizards.NewTestCaseCreationWizard</tags>
<tags>persp.actionSet:org.eclipse.jdt.junit.JUnitActionSet</tags>
<tags>persp.viewSC:org.eclipse.ant.ui.views.AntView</tags>
<children xsi:type="basic:PartSashContainer" xmi:id="_j-3h4aqaEey5jqTQ6NA1QA" selectedElement="_j-3h7KqaEey5jqTQ6NA1QA" horizontal="true">
<children xsi:type="basic:PartSashContainer" xmi:id="_j-3h4aqaEey5jqTQ6NA1QA" selectedElement="_j-3h4qqaEey5jqTQ6NA1QA" horizontal="true">
<children xsi:type="basic:PartSashContainer" xmi:id="_j-3h4qqaEey5jqTQ6NA1QA" containerData="2500" selectedElement="_j-3h46qaEey5jqTQ6NA1QA">
<children xsi:type="basic:PartStack" xmi:id="_j-3h46qaEey5jqTQ6NA1QA" elementId="left" containerData="6000" selectedElement="_j-3h5KqaEey5jqTQ6NA1QA">
<children xsi:type="basic:PartStack" xmi:id="_j-3h46qaEey5jqTQ6NA1QA" elementId="left" containerData="6000" selectedElement="_j-3h5qqaEey5jqTQ6NA1QA">
<tags>org.eclipse.e4.primaryNavigationStack</tags>
<children xsi:type="advanced:Placeholder" xmi:id="_j-3h5KqaEey5jqTQ6NA1QA" elementId="org.eclipse.jdt.ui.PackageExplorer" ref="_j-nDMKqaEey5jqTQ6NA1QA" closeable="true">
<tags>active</tags>
<children xsi:type="advanced:Placeholder" xmi:id="_j-3h5KqaEey5jqTQ6NA1QA" elementId="org.eclipse.jdt.ui.PackageExplorer" toBeRendered="false" ref="_j-nDMKqaEey5jqTQ6NA1QA" closeable="true">
<tags>View</tags>
<tags>categoryTag:Java</tags>
</children>
<children xsi:type="advanced:Placeholder" xmi:id="_j-3h5aqaEey5jqTQ6NA1QA" elementId="org.eclipse.jdt.ui.TypeHierarchy" toBeRendered="false" ref="_j-pfcKqaEey5jqTQ6NA1QA" closeable="true">
<tags>View</tags>
<tags>categoryTag:Java</tags>
</children>
<children xsi:type="advanced:Placeholder" xmi:id="_j-3h5qqaEey5jqTQ6NA1QA" elementId="org.eclipse.ui.navigator.ProjectExplorer" toBeRendered="false" ref="_j-pfcaqaEey5jqTQ6NA1QA" closeable="true">
<children xsi:type="advanced:Placeholder" xmi:id="_j-3h5qqaEey5jqTQ6NA1QA" elementId="org.eclipse.ui.navigator.ProjectExplorer" ref="_j-pfcaqaEey5jqTQ6NA1QA" closeable="true">
<tags>View</tags>
<tags>categoryTag:General</tags>
</children>
Expand All @@ -109,7 +110,7 @@
</children>
</children>
</children>
<children xsi:type="basic:PartSashContainer" xmi:id="_j-3h7KqaEey5jqTQ6NA1QA" containerData="7500" selectedElement="_j-3h9KqaEey5jqTQ6NA1QA">
<children xsi:type="basic:PartSashContainer" xmi:id="_j-3h7KqaEey5jqTQ6NA1QA" containerData="7500" selectedElement="_j-3h7aqaEey5jqTQ6NA1QA">
<children xsi:type="basic:PartSashContainer" xmi:id="_j-3h7aqaEey5jqTQ6NA1QA" containerData="7500" selectedElement="_j-3h7qqaEey5jqTQ6NA1QA" horizontal="true">
<children xsi:type="advanced:Placeholder" xmi:id="_j-3h7qqaEey5jqTQ6NA1QA" elementId="org.eclipse.ui.editorss" containerData="7500" ref="_j-cEEKqaEey5jqTQ6NA1QA"/>
<children xsi:type="basic:PartStack" xmi:id="_j-3h76qaEey5jqTQ6NA1QA" elementId="right" containerData="2500" selectedElement="_j-3h8KqaEey5jqTQ6NA1QA">
Expand Down Expand Up @@ -214,18 +215,9 @@
<tags>categoryTag:General</tags>
</sharedElements>
<sharedElements xsi:type="advanced:Area" xmi:id="_j-cEEKqaEey5jqTQ6NA1QA" elementId="org.eclipse.ui.editorss" selectedElement="_j-cEEaqaEey5jqTQ6NA1QA">
<children xsi:type="basic:PartStack" xmi:id="_j-cEEaqaEey5jqTQ6NA1QA" elementId="org.eclipse.e4.primaryDataStack" selectedElement="_2FyD8KqaEey5jqTQ6NA1QA">
<children xsi:type="basic:PartStack" xmi:id="_j-cEEaqaEey5jqTQ6NA1QA" elementId="org.eclipse.e4.primaryDataStack">
<tags>org.eclipse.e4.primaryDataStack</tags>
<tags>EditorStack</tags>
<tags>active</tags>
<children xsi:type="basic:Part" xmi:id="_2FyD8KqaEey5jqTQ6NA1QA" elementId="org.eclipse.e4.ui.compatibility.editor" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityEditor" label="DesktopLauncher.java" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/obj16/jcu_obj.png" closeable="true">
<persistedState key="memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>&#xD;&#xA;&lt;editor id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot; name=&quot;DesktopLauncher.java&quot; partName=&quot;DesktopLauncher.java&quot; title=&quot;DesktopLauncher.java&quot; tooltip=&quot;SuperPacoBros-desktop/src/com/paco/game/DesktopLauncher.java&quot;>&#xD;&#xA;&lt;input factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; path=&quot;/SuperPacoBros-desktop/src/com/paco/game/DesktopLauncher.java&quot;/>&#xD;&#xA;&lt;editorState selectionHorizontalPixel=&quot;0&quot; selectionLength=&quot;0&quot; selectionOffset=&quot;0&quot; selectionTopPixel=&quot;0&quot;/>&#xD;&#xA;&lt;/editor>"/>
<tags>Editor</tags>
<tags>removeOnHide</tags>
<tags>org.eclipse.jdt.ui.CompilationUnitEditor</tags>
<tags>active</tags>
<tags>activeOnClose</tags>
</children>
</children>
</sharedElements>
<sharedElements xsi:type="basic:Part" xmi:id="_j-nDMKqaEey5jqTQ6NA1QA" elementId="org.eclipse.jdt.ui.PackageExplorer" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Package Explorer" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/eview16/package.png" tooltip="" closeable="true">
Expand All @@ -249,8 +241,16 @@
<sharedElements xsi:type="basic:Part" xmi:id="_j-pfcaqaEey5jqTQ6NA1QA" elementId="org.eclipse.ui.navigator.ProjectExplorer" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Project Explorer" iconURI="platform:/plugin/org.eclipse.ui.navigator.resources/icons/full/eview16/resource_persp.png" tooltip="" closeable="true">
<persistedState key="originalCompatibilityViewClass" value="org.eclipse.ui.navigator.resources.ProjectExplorer"/>
<persistedState key="originalCompatibilityViewBundle" value="org.eclipse.ui.navigator.resources"/>
<persistedState key="memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>&#xD;&#xA;&lt;view CommonNavigator.LINKING_ENABLED=&quot;0&quot; currentWorkingSetName=&quot;Aggregate for window 1648034136685&quot; org.eclipse.ui.navigator.resources.workingSets.showTopLevelWorkingSets=&quot;0&quot;>&#xD;&#xA;&lt;lastRecentlyUsedFilters/>&#xD;&#xA;&lt;/view>"/>
<tags>View</tags>
<tags>categoryTag:General</tags>
<tags>active</tags>
<tags>activeOnClose</tags>
<menus xmi:id="_rMif4KtSEeyWMv83qfeSlA" elementId="org.eclipse.ui.navigator.ProjectExplorer">
<tags>ViewMenu</tags>
<tags>menuContribution:menu</tags>
</menus>
<toolbar xmi:id="_rMif4atSEeyWMv83qfeSlA" elementId="org.eclipse.ui.navigator.ProjectExplorer" visible="false"/>
</sharedElements>
<sharedElements xsi:type="basic:Part" xmi:id="_j-qGgKqaEey5jqTQ6NA1QA" elementId="org.eclipse.ui.views.ProblemView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Problems" iconURI="platform:/plugin/org.eclipse.ui.ide/icons/full/eview16/problems_view.png" tooltip="" closeable="true">
<persistedState key="originalCompatibilityViewClass" value="org.eclipse.ui.internal.views.markers.ProblemsView"/>
Expand Down Expand Up @@ -397,7 +397,7 @@
</children>
<children xsi:type="menu:ToolBar" xmi:id="_j3-PsKqaEey5jqTQ6NA1QA" elementId="org.eclipse.ui.workbench.file">
<tags>Draggable</tags>
<children xsi:type="menu:HandledToolItem" xmi:id="_j4B6EKqaEey5jqTQ6NA1QA" elementId="print" visible="false" iconURI="platform:/plugin/org.eclipse.ui/icons/full/etool16/print_edit.png" tooltip="Print" command="_jYuInaqaEey5jqTQ6NA1QA"/>
<children xsi:type="menu:HandledToolItem" xmi:id="_lWL7EKtTEeyoJOuUQpvpgQ" elementId="print" visible="false" iconURI="platform:/plugin/org.eclipse.ui/icons/full/etool16/print_edit.png" tooltip="Print" command="_jYuInaqaEey5jqTQ6NA1QA"/>
</children>
<children xsi:type="menu:ToolBar" xmi:id="_j3-PsaqaEey5jqTQ6NA1QA" elementId="group.edit" toBeRendered="false">
<tags>toolbarSeparator</tags>
Expand All @@ -419,7 +419,7 @@
<children xsi:type="menu:ToolBar" xmi:id="_kAhHsKqaEey5jqTQ6NA1QA" elementId="org.eclipse.search.searchActionSet">
<tags>Draggable</tags>
</children>
<children xsi:type="menu:ToolBar" xmi:id="_qTPC8KqaEey5jqTQ6NA1QA" elementId="org.eclipse.ui.edit.text.actionSet.presentation">
<children xsi:type="menu:ToolBar" xmi:id="_qTPC8KqaEey5jqTQ6NA1QA" elementId="org.eclipse.ui.edit.text.actionSet.presentation" visible="false">
<tags>Draggable</tags>
</children>
<children xsi:type="menu:ToolBar" xmi:id="_j3-PtqqaEey5jqTQ6NA1QA" elementId="group.nav" toBeRendered="false">
Expand All @@ -428,7 +428,7 @@
</children>
<children xsi:type="menu:ToolBar" xmi:id="_j3-PuKqaEey5jqTQ6NA1QA" elementId="org.eclipse.ui.workbench.navigate">
<tags>Draggable</tags>
<children xsi:type="menu:HandledToolItem" xmi:id="_j4ChIKqaEey5jqTQ6NA1QA" elementId="org.eclipse.ui.window.pinEditor" iconURI="platform:/plugin/org.eclipse.ui/icons/full/etool16/pin_editor.png" tooltip="Pin Editor" enabled="false" type="Check" command="_jYuIHKqaEey5jqTQ6NA1QA"/>
<children xsi:type="menu:HandledToolItem" xmi:id="_lWPlcKtTEeyoJOuUQpvpgQ" elementId="org.eclipse.ui.window.pinEditor" iconURI="platform:/plugin/org.eclipse.ui/icons/full/etool16/pin_editor.png" tooltip="Pin Editor" enabled="false" type="Check" command="_jYuIHKqaEey5jqTQ6NA1QA"/>
</children>
<children xsi:type="menu:ToolBar" xmi:id="_j3-PuaqaEey5jqTQ6NA1QA" elementId="group.editor" toBeRendered="false">
<tags>toolbarSeparator</tags>
Expand Down
Binary file modified .metadata/.plugins/org.eclipse.jdt.core/1865797976.index
View file
Binary file not shown.
Binary file modified .metadata/.plugins/org.eclipse.jdt.core/externalFilesCache
View file
Binary file not shown.
9 changes: 5 additions & 4 deletions .metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ INDEX VERSION 1.131+C:\Users\mario\Documents\GitHub\MarioGabIFP\Super_Paco_Bros\
3995027108.index
1973561317.index
3885786831.index
193490017.index
3990670468.index
3446081204.index
193490017.index
1865797976.index
3307210469.index
2584870405.index
1865797976.index
3990670468.index
2071674118.index
2881960682.index
1265598562.index
Expand All @@ -22,9 +22,10 @@ INDEX VERSION 1.131+C:\Users\mario\Documents\GitHub\MarioGabIFP\Super_Paco_Bros\
240943240.index
2251499996.index
2574099473.index
1642175237.index
4153573058.index
3103961500.index
3625172027.index
4153573058.index
2216734264.index
2048703835.index
3273598559.index
Expand Down
2 changes: 2 additions & 0 deletions .metadata/.plugins/org.eclipse.m2e.logback.configuration/0.log
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,5 @@
=======
>>>>>>> aefdc99b447f4c2e53fc68e4066d71ca85feec2e
2022-03-23 12:15:37,865 [Worker-6: Loading available Gradle versions] INFO o.e.b.c.i.u.g.PublishedGradleVersions - Gradle version information cache is up-to-date. Trying to read.
2022-03-24 10:10:59,463 [Worker-5: Loading available Gradle versions] INFO o.e.b.c.i.u.g.PublishedGradleVersions - Gradle version information cache is up-to-date. Trying to read.
2022-03-24 10:20:03,807 [Worker-2: Loading available Gradle versions] INFO o.e.b.c.i.u.g.PublishedGradleVersions - Gradle version information cache is up-to-date. Trying to read.
2 changes: 1 addition & 1 deletion .metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#Cached timestamps
#Wed Mar 23 12:17:52 CET 2022
#Thu Mar 24 10:14:03 CET 2022
2 changes: 1 addition & 1 deletion .metadata/version.ini
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#Wed Mar 23 12:15:31 CET 2022
#Thu Mar 24 10:20:00 CET 2022
org.eclipse.core.runtime=2
org.eclipse.platform=4.23.0.v20220308-0310
2 changes: 1 addition & 1 deletion Game/desktop/src/com/paco/game/DesktopLauncher.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public class DesktopLauncher {
public static void main (String[] arg) {
Lwjgl3ApplicationConfiguration config = new Lwjgl3ApplicationConfiguration();
config.setFullscreenMode(Lwjgl3ApplicationConfiguration.getDisplayMode());
config.setForegroundFPS(60);
config.setForegroundFPS(Lwjgl3ApplicationConfiguration.getDisplayMode().refreshRate);
new Lwjgl3Application(new Screen(), config);
}
}

0 comments on commit b09c3dc

Please sign in to comment.