Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- M src/main/java/vswe/stevesfactory/ui/manager/editor/PropertyManager.java
- D src/main/java/vswe/stevesfactory/ui/manager/menu/FilterSettings.java
- M src/main/java/vswe/stevesfactory/ui/manager/menu/FilterSlot.java
- M src/main/java/vswe/stevesfactory/ui/manager/menu/IntervalMenu.java
- M src/main/java/vswe/stevesfactory/ui/manager/menu/ItemTagFilterMenu.java
- M src/main/java/vswe/stevesfactory/ui/manager/menu/ItemTraitsFilterMenu.java
- M src/main/java/vswe/stevesfactory/ui/manager/selection/ComponentGroup.java
- M src/main/java/vswe/stevesfactory/ui/manager/selection/GroupComponentChoice.java
- M src/main/java/vswe/stevesfactory/ui/manager/selection/IComponentChoice.java
- M src/main/java/vswe/stevesfactory/utils/IOHelper.java
- M src/main/java/vswe/stevesfactory/utils/NetworkHelper.java
- M src/main/resources/assets/sfm/component_groups/item_io.json
- M src/main/resources/assets/sfm/component_groups/trigger.json
- M src/main/resources/assets/sfm/lang/en_us.json
- D src/main/resources/assets/sfm/textures/gui/component_icon/batched_item_transfer.png
- D src/main/resources/assets/sfm/textures/gui/component_icon/timed_trigger.png
- [ul_708@hpZ600Workstation StevesFactoryManager]$ git status
- On branch 1.14
- Your branch is behind 'origin/1.14' by 7 commits, and can be fast-forwarded.
- (use "git pull" to update your local branch)
- Changes not staged for commit:
- (use "git add/rm <file>..." to update what will be committed)
- (use "git restore <file>..." to discard changes in working directory)
- modified: gradle.properties
- modified: src/main/java/vswe/stevesfactory/StevesFactoryManager.java
- modified: src/main/java/vswe/stevesfactory/api/logic/CommandGraph.java
- modified: src/main/java/vswe/stevesfactory/api/logic/IExecutionContext.java
- modified: src/main/java/vswe/stevesfactory/api/logic/IProcedure.java
- modified: src/main/java/vswe/stevesfactory/api/logic/IProcedureClientData.java
- modified: src/main/java/vswe/stevesfactory/api/logic/IProcedureType.java
- modified: src/main/java/vswe/stevesfactory/blocks/FactoryManagerTileEntity.java
- deleted: src/main/java/vswe/stevesfactory/library/gui/contextmenu/AbstractEntry.java
- modified: src/main/java/vswe/stevesfactory/library/gui/contextmenu/CallbackEntry.java
- modified: src/main/java/vswe/stevesfactory/library/gui/debug/Inspections.java
- modified: src/main/java/vswe/stevesfactory/library/gui/layout/FlowLayout.java
- modified: src/main/java/vswe/stevesfactory/library/gui/widget/IWidget.java
- modified: src/main/java/vswe/stevesfactory/library/gui/widget/NumberField.java
- modified: src/main/java/vswe/stevesfactory/library/gui/widget/TextButton.java
- modified: src/main/java/vswe/stevesfactory/library/gui/widget/TextField.java
- modified: src/main/java/vswe/stevesfactory/library/gui/widget/box/LinearList.java
- modified: src/main/java/vswe/stevesfactory/library/gui/window/Dialog.java
- modified: src/main/java/vswe/stevesfactory/logic/AbstractProcedure.java
- modified: src/main/java/vswe/stevesfactory/logic/Procedures.java
- modified: src/main/java/vswe/stevesfactory/logic/SimpleProcedureType.java
- modified: src/main/java/vswe/stevesfactory/logic/execution/ProcedureExecutor.java
- modified: src/main/java/vswe/stevesfactory/logic/item/IItemFilter.java
- modified: src/main/java/vswe/stevesfactory/logic/item/ItemBufferElement.java
- modified: src/main/java/vswe/stevesfactory/logic/item/ItemTagFilter.java
- modified: src/main/java/vswe/stevesfactory/logic/item/ItemTraitsFilter.java
- deleted: src/main/java/vswe/stevesfactory/logic/procedure/BatchedItemTransferProcedure.java
- modified: src/main/java/vswe/stevesfactory/logic/procedure/ItemExportProcedure.java
- modified: src/main/java/vswe/stevesfactory/logic/procedure/ItemImportProcedure.java
- deleted: src/main/java/vswe/stevesfactory/logic/procedure/TimedTriggerProcedure.java
- modified: src/main/java/vswe/stevesfactory/network/NetworkHandler.java
- modified: src/main/java/vswe/stevesfactory/network/PacketSyncCommandGraphs.java
- modified: src/main/java/vswe/stevesfactory/ui/manager/FactoryManagerGUI.java
- modified: src/main/java/vswe/stevesfactory/ui/manager/UserPreferencesPanel.java
- modified: src/main/java/vswe/stevesfactory/ui/manager/editor/EditorPanel.java
- modified: src/main/java/vswe/stevesfactory/ui/manager/editor/OffsetText.java
- modified: src/main/java/vswe/stevesfactory/ui/manager/editor/PropertyManager.java
- deleted: src/main/java/vswe/stevesfactory/ui/manager/menu/FilterSettings.java
- modified: src/main/java/vswe/stevesfactory/ui/manager/menu/FilterSlot.java
- modified: src/main/java/vswe/stevesfactory/ui/manager/menu/IntervalMenu.java
- modified: src/main/java/vswe/stevesfactory/ui/manager/menu/ItemTagFilterMenu.java
- modified: src/main/java/vswe/stevesfactory/ui/manager/menu/ItemTraitsFilterMenu.java
- modified: src/main/java/vswe/stevesfactory/ui/manager/selection/ComponentGroup.java
- modified: src/main/java/vswe/stevesfactory/ui/manager/selection/GroupComponentChoice.java
- modified: src/main/java/vswe/stevesfactory/ui/manager/selection/IComponentChoice.java
- modified: src/main/java/vswe/stevesfactory/utils/IOHelper.java
- modified: src/main/java/vswe/stevesfactory/utils/NetworkHelper.java
- modified: src/main/resources/assets/sfm/component_groups/item_io.json
- modified: src/main/resources/assets/sfm/component_groups/trigger.json
- modified: src/main/resources/assets/sfm/lang/en_us.json
- deleted: src/main/resources/assets/sfm/textures/gui/component_icon/batched_item_transfer.png
- deleted: src/main/resources/assets/sfm/textures/gui/component_icon/timed_trigger.png
- Untracked files:
- (use "git add <file>..." to include in what will be committed)
- src/main/java/vswe/stevesfactory/Config.java
- src/main/java/vswe/stevesfactory/api/item/
- src/main/java/vswe/stevesfactory/library/gui/contextmenu/DefaultEntry.java
- src/main/java/vswe/stevesfactory/logic/item/CraftingBufferElement.java
- src/main/java/vswe/stevesfactory/logic/procedure/IntervalTriggerProcedure.java
- src/main/java/vswe/stevesfactory/logic/procedure/ItemTransferProcedure.java
- src/main/java/vswe/stevesfactory/network/PacketInspectionsSetting.java
- src/main/java/vswe/stevesfactory/network/PacketReloadComponentGroups.java
- src/main/java/vswe/stevesfactory/ui/manager/menu/MultiLayerMenu.java
- src/main/java/vswe/stevesfactory/ui/manager/menu/SettingsEditor.java
- src/main/resources/assets/sfm/textures/gui/component_icon/interval_trigger.png
- src/main/resources/assets/sfm/textures/gui/component_icon/item_io.png
- src/main/resources/assets/sfm/textures/gui/component_icon/item_transfer.png
- no changes added to commit (use "git add" and/or "git commit -a")
- [ul_708@hpZ600Workstation StevesFactoryManager]$ git stash
- Saved working directory and index state WIP on 1.14: 2dcca1d Fix menus not collpased on creation, fix stack size limiting Renamed ActionMenu to ContextMenu for consistency with the complete GUI lib
- [ul_708@hpZ600Workstation StevesFactoryManager]$ git stash pop
- Removing src/main/resources/assets/sfm/textures/gui/component_icon/timed_trigger.png
- Removing src/main/resources/assets/sfm/textures/gui/component_icon/batched_item_transfer.png
- Removing src/main/java/vswe/stevesfactory/ui/manager/menu/FilterSettings.java
- Removing src/main/java/vswe/stevesfactory/logic/procedure/TimedTriggerProcedure.java
- Removing src/main/java/vswe/stevesfactory/logic/procedure/BatchedItemTransferProcedure.java
- Removing src/main/java/vswe/stevesfactory/library/gui/contextmenu/AbstractEntry.java
- On branch 1.14
- Your branch is behind 'origin/1.14' by 7 commits, and can be fast-forwarded.
- (use "git pull" to update your local branch)
- Changes not staged for commit:
- (use "git add/rm <file>..." to update what will be committed)
- (use "git restore <file>..." to discard changes in working directory)
- modified: gradle.properties
- modified: src/main/java/vswe/stevesfactory/StevesFactoryManager.java
- modified: src/main/java/vswe/stevesfactory/api/logic/CommandGraph.java
- modified: src/main/java/vswe/stevesfactory/api/logic/IExecutionContext.java
- modified: src/main/java/vswe/stevesfactory/api/logic/IProcedure.java
- modified: src/main/java/vswe/stevesfactory/api/logic/IProcedureClientData.java
- modified: src/main/java/vswe/stevesfactory/api/logic/IProcedureType.java
- modified: src/main/java/vswe/stevesfactory/blocks/FactoryManagerTileEntity.java
- deleted: src/main/java/vswe/stevesfactory/library/gui/contextmenu/AbstractEntry.java
- modified: src/main/java/vswe/stevesfactory/library/gui/contextmenu/CallbackEntry.java
- modified: src/main/java/vswe/stevesfactory/library/gui/debug/Inspections.java
- modified: src/main/java/vswe/stevesfactory/library/gui/layout/FlowLayout.java
- modified: src/main/java/vswe/stevesfactory/library/gui/widget/IWidget.java
- modified: src/main/java/vswe/stevesfactory/library/gui/widget/NumberField.java
- modified: src/main/java/vswe/stevesfactory/library/gui/widget/TextButton.java
- modified: src/main/java/vswe/stevesfactory/library/gui/widget/TextField.java
- modified: src/main/java/vswe/stevesfactory/library/gui/widget/box/LinearList.java
- modified: src/main/java/vswe/stevesfactory/library/gui/window/Dialog.java
- modified: src/main/java/vswe/stevesfactory/logic/AbstractProcedure.java
- modified: src/main/java/vswe/stevesfactory/logic/Procedures.java
- modified: src/main/java/vswe/stevesfactory/logic/SimpleProcedureType.java
- modified: src/main/java/vswe/stevesfactory/logic/execution/ProcedureExecutor.java
- modified: src/main/java/vswe/stevesfactory/logic/item/IItemFilter.java
- modified: src/main/java/vswe/stevesfactory/logic/item/ItemBufferElement.java
- modified: src/main/java/vswe/stevesfactory/logic/item/ItemTagFilter.java
- modified: src/main/java/vswe/stevesfactory/logic/item/ItemTraitsFilter.java
- deleted: src/main/java/vswe/stevesfactory/logic/procedure/BatchedItemTransferProcedure.java
- modified: src/main/java/vswe/stevesfactory/logic/procedure/ItemExportProcedure.java
- modified: src/main/java/vswe/stevesfactory/logic/procedure/ItemImportProcedure.java
- deleted: src/main/java/vswe/stevesfactory/logic/procedure/TimedTriggerProcedure.java
- modified: src/main/java/vswe/stevesfactory/network/NetworkHandler.java
- modified: src/main/java/vswe/stevesfactory/network/PacketSyncCommandGraphs.java
- modified: src/main/java/vswe/stevesfactory/ui/manager/FactoryManagerGUI.java
- modified: src/main/java/vswe/stevesfactory/ui/manager/UserPreferencesPanel.java
- modified: src/main/java/vswe/stevesfactory/ui/manager/editor/EditorPanel.java
- modified: src/main/java/vswe/stevesfactory/ui/manager/editor/OffsetText.java
- modified: src/main/java/vswe/stevesfactory/ui/manager/editor/PropertyManager.java
- deleted: src/main/java/vswe/stevesfactory/ui/manager/menu/FilterSettings.java
- modified: src/main/java/vswe/stevesfactory/ui/manager/menu/FilterSlot.java
- modified: src/main/java/vswe/stevesfactory/ui/manager/menu/IntervalMenu.java
- modified: src/main/java/vswe/stevesfactory/ui/manager/menu/ItemTagFilterMenu.java
- modified: src/main/java/vswe/stevesfactory/ui/manager/menu/ItemTraitsFilterMenu.java
- modified: src/main/java/vswe/stevesfactory/ui/manager/selection/ComponentGroup.java
- modified: src/main/java/vswe/stevesfactory/ui/manager/selection/GroupComponentChoice.java
- modified: src/main/java/vswe/stevesfactory/ui/manager/selection/IComponentChoice.java
- modified: src/main/java/vswe/stevesfactory/utils/IOHelper.java
- modified: src/main/java/vswe/stevesfactory/utils/NetworkHelper.java
- modified: src/main/resources/assets/sfm/component_groups/item_io.json
- modified: src/main/resources/assets/sfm/component_groups/trigger.json
- modified: src/main/resources/assets/sfm/lang/en_us.json
- deleted: src/main/resources/assets/sfm/textures/gui/component_icon/batched_item_transfer.png
- deleted: src/main/resources/assets/sfm/textures/gui/component_icon/timed_trigger.png
- Untracked files:
- (use "git add <file>..." to include in what will be committed)
- src/main/java/vswe/stevesfactory/Config.java
- src/main/java/vswe/stevesfactory/api/item/
- src/main/java/vswe/stevesfactory/library/gui/contextmenu/DefaultEntry.java
- src/main/java/vswe/stevesfactory/logic/item/CraftingBufferElement.java
- src/main/java/vswe/stevesfactory/logic/procedure/IntervalTriggerProcedure.java
- src/main/java/vswe/stevesfactory/logic/procedure/ItemTransferProcedure.java
- src/main/java/vswe/stevesfactory/network/PacketInspectionsSetting.java
- src/main/java/vswe/stevesfactory/network/PacketReloadComponentGroups.java
- src/main/java/vswe/stevesfactory/ui/manager/menu/MultiLayerMenu.java
- src/main/java/vswe/stevesfactory/ui/manager/menu/SettingsEditor.java
- src/main/resources/assets/sfm/textures/gui/component_icon/interval_trigger.png
- src/main/resources/assets/sfm/textures/gui/component_icon/item_io.png
- src/main/resources/assets/sfm/textures/gui/component_icon/item_transfer.png
- no changes added to commit (use "git add" and/or "git commit -a")
- Dropped refs/stash@{0} (79f0f90e2f04a27c4dd13435050d39aad9e0c5fe)
- [ul_708@hpZ600Workstation StevesFactoryManager]$ git add .
- [ul_708@hpZ600Workstation StevesFactoryManager]$ git status
- On branch 1.14
- Your branch is behind 'origin/1.14' by 7 commits, and can be fast-forwarded.
- (use "git pull" to update your local branch)
- Changes to be committed:
- (use "git restore --staged <file>..." to unstage)
- modified: gradle.properties
- new file: src/main/java/vswe/stevesfactory/Config.java
- modified: src/main/java/vswe/stevesfactory/StevesFactoryManager.java
- new file: src/main/java/vswe/stevesfactory/api/item/IItemBufferElement.java
- modified: src/main/java/vswe/stevesfactory/api/logic/CommandGraph.java
- modified: src/main/java/vswe/stevesfactory/api/logic/IExecutionContext.java
- modified: src/main/java/vswe/stevesfactory/api/logic/IProcedure.java
- modified: src/main/java/vswe/stevesfactory/api/logic/IProcedureClientData.java
- modified: src/main/java/vswe/stevesfactory/api/logic/IProcedureType.java
- modified: src/main/java/vswe/stevesfactory/blocks/FactoryManagerTileEntity.java
- modified: src/main/java/vswe/stevesfactory/library/gui/contextmenu/CallbackEntry.java
- renamed: src/main/java/vswe/stevesfactory/library/gui/contextmenu/AbstractEntry.java -> src/main/java/vswe/stevesfactory/library/gui/contextmenu/DefaultEntry.java
- modified: src/main/java/vswe/stevesfactory/library/gui/debug/Inspections.java
- modified: src/main/java/vswe/stevesfactory/library/gui/layout/FlowLayout.java
- modified: src/main/java/vswe/stevesfactory/library/gui/widget/IWidget.java
- modified: src/main/java/vswe/stevesfactory/library/gui/widget/NumberField.java
- modified: src/main/java/vswe/stevesfactory/library/gui/widget/TextButton.java
- modified: src/main/java/vswe/stevesfactory/library/gui/widget/TextField.java
- modified: src/main/java/vswe/stevesfactory/library/gui/widget/box/LinearList.java
- modified: src/main/java/vswe/stevesfactory/library/gui/window/Dialog.java
- modified: src/main/java/vswe/stevesfactory/logic/AbstractProcedure.java
- modified: src/main/java/vswe/stevesfactory/logic/Procedures.java
- modified: src/main/java/vswe/stevesfactory/logic/SimpleProcedureType.java
- modified: src/main/java/vswe/stevesfactory/logic/execution/ProcedureExecutor.java
- new file: src/main/java/vswe/stevesfactory/logic/item/CraftingBufferElement.java
- modified: src/main/java/vswe/stevesfactory/logic/item/IItemFilter.java
- modified: src/main/java/vswe/stevesfactory/logic/item/ItemBufferElement.java
- modified: src/main/java/vswe/stevesfactory/logic/item/ItemTagFilter.java
- modified: src/main/java/vswe/stevesfactory/logic/item/ItemTraitsFilter.java
- renamed: src/main/java/vswe/stevesfactory/logic/procedure/TimedTriggerProcedure.java -> src/main/java/vswe/stevesfactory/logic/procedure/IntervalTriggerProcedure.java
- modified: src/main/java/vswe/stevesfactory/logic/procedure/ItemExportProcedure.java
- modified: src/main/java/vswe/stevesfactory/logic/procedure/ItemImportProcedure.java
- renamed: src/main/java/vswe/stevesfactory/logic/procedure/BatchedItemTransferProcedure.java -> src/main/java/vswe/stevesfactory/logic/procedure/ItemTransferProcedure.java
- modified: src/main/java/vswe/stevesfactory/network/NetworkHandler.java
- new file: src/main/java/vswe/stevesfactory/network/PacketInspectionsSetting.java
- new file: src/main/java/vswe/stevesfactory/network/PacketReloadComponentGroups.java
- modified: src/main/java/vswe/stevesfactory/network/PacketSyncCommandGraphs.java
- modified: src/main/java/vswe/stevesfactory/ui/manager/FactoryManagerGUI.java
- modified: src/main/java/vswe/stevesfactory/ui/manager/UserPreferencesPanel.java
- modified: src/main/java/vswe/stevesfactory/ui/manager/editor/EditorPanel.java
- modified: src/main/java/vswe/stevesfactory/ui/manager/editor/OffsetText.java
- modified: src/main/java/vswe/stevesfactory/ui/manager/editor/PropertyManager.java
- deleted: src/main/java/vswe/stevesfactory/ui/manager/menu/FilterSettings.java
- modified: src/main/java/vswe/stevesfactory/ui/manager/menu/FilterSlot.java
- modified: src/main/java/vswe/stevesfactory/ui/manager/menu/IntervalMenu.java
- modified: src/main/java/vswe/stevesfactory/ui/manager/menu/ItemTagFilterMenu.java
- modified: src/main/java/vswe/stevesfactory/ui/manager/menu/ItemTraitsFilterMenu.java
- new file: src/main/java/vswe/stevesfactory/ui/manager/menu/MultiLayerMenu.java
- new file: src/main/java/vswe/stevesfactory/ui/manager/menu/SettingsEditor.java
- modified: src/main/java/vswe/stevesfactory/ui/manager/selection/ComponentGroup.java
- modified: src/main/java/vswe/stevesfactory/ui/manager/selection/GroupComponentChoice.java
- modified: src/main/java/vswe/stevesfactory/ui/manager/selection/IComponentChoice.java
- modified: src/main/java/vswe/stevesfactory/utils/IOHelper.java
- modified: src/main/java/vswe/stevesfactory/utils/NetworkHelper.java
- modified: src/main/resources/assets/sfm/component_groups/item_io.json
- modified: src/main/resources/assets/sfm/component_groups/trigger.json
- modified: src/main/resources/assets/sfm/lang/en_us.json
- new file: src/main/resources/assets/sfm/textures/gui/component_icon/interval_trigger.png
- new file: src/main/resources/assets/sfm/textures/gui/component_icon/item_io.png
- renamed: src/main/resources/assets/sfm/textures/gui/component_icon/batched_item_transfer.png -> src/main/resources/assets/sfm/textures/gui/component_icon/item_transfer.png
- deleted: src/main/resources/assets/sfm/textures/gui/component_icon/timed_trigger.png
- [ul_708@hpZ600Workstation StevesFactoryManager]$ git stash
- Saved working directory and index state WIP on 1.14: 2dcca1d Fix menus not collpased on creation, fix stack size limiting Renamed ActionMenu to ContextMenu for consistency with the complete GUI lib
- [ul_708@hpZ600Workstation StevesFactoryManager]$ git stash pop
- Removing src/main/resources/assets/sfm/textures/gui/component_icon/timed_trigger.png
- Removing src/main/java/vswe/stevesfactory/ui/manager/menu/FilterSettings.java
- On branch 1.14
- Your branch is behind 'origin/1.14' by 7 commits, and can be fast-forwarded.
- (use "git pull" to update your local branch)
- Changes to be committed:
- (use "git restore --staged <file>..." to unstage)
- new file: src/main/java/vswe/stevesfactory/Config.java
- new file: src/main/java/vswe/stevesfactory/api/item/IItemBufferElement.java
- new file: src/main/java/vswe/stevesfactory/library/gui/contextmenu/DefaultEntry.java
- new file: src/main/java/vswe/stevesfactory/logic/item/CraftingBufferElement.java
- new file: src/main/java/vswe/stevesfactory/logic/procedure/IntervalTriggerProcedure.java
- new file: src/main/java/vswe/stevesfactory/logic/procedure/ItemTransferProcedure.java
- new file: src/main/java/vswe/stevesfactory/network/PacketInspectionsSetting.java
- new file: src/main/java/vswe/stevesfactory/network/PacketReloadComponentGroups.java
- new file: src/main/java/vswe/stevesfactory/ui/manager/menu/MultiLayerMenu.java
- new file: src/main/java/vswe/stevesfactory/ui/manager/menu/SettingsEditor.java
- new file: src/main/resources/assets/sfm/textures/gui/component_icon/interval_trigger.png
- new file: src/main/resources/assets/sfm/textures/gui/component_icon/item_io.png
- new file: src/main/resources/assets/sfm/textures/gui/component_icon/item_transfer.png
- Changes not staged for commit:
- (use "git add/rm <file>..." to update what will be committed)
- (use "git restore <file>..." to discard changes in working directory)
- modified: gradle.properties
- modified: src/main/java/vswe/stevesfactory/StevesFactoryManager.java
- modified: src/main/java/vswe/stevesfactory/api/logic/CommandGraph.java
- modified: src/main/java/vswe/stevesfactory/api/logic/IExecutionContext.java
- modified: src/main/java/vswe/stevesfactory/api/logic/IProcedure.java
- modified: src/main/java/vswe/stevesfactory/api/logic/IProcedureClientData.java
- modified: src/main/java/vswe/stevesfactory/api/logic/IProcedureType.java
- modified: src/main/java/vswe/stevesfactory/blocks/FactoryManagerTileEntity.java
- deleted: src/main/java/vswe/stevesfactory/library/gui/contextmenu/AbstractEntry.java
- modified: src/main/java/vswe/stevesfactory/library/gui/contextmenu/CallbackEntry.java
- modified: src/main/java/vswe/stevesfactory/library/gui/debug/Inspections.java
- modified: src/main/java/vswe/stevesfactory/library/gui/layout/FlowLayout.java
- modified: src/main/java/vswe/stevesfactory/library/gui/widget/IWidget.java
- modified: src/main/java/vswe/stevesfactory/library/gui/widget/NumberField.java
- modified: src/main/java/vswe/stevesfactory/library/gui/widget/TextButton.java
- modified: src/main/java/vswe/stevesfactory/library/gui/widget/TextField.java
- modified: src/main/java/vswe/stevesfactory/library/gui/widget/box/LinearList.java
- modified: src/main/java/vswe/stevesfactory/library/gui/window/Dialog.java
- modified: src/main/java/vswe/stevesfactory/logic/AbstractProcedure.java
- modified: src/main/java/vswe/stevesfactory/logic/Procedures.java
- modified: src/main/java/vswe/stevesfactory/logic/SimpleProcedureType.java
- modified: src/main/java/vswe/stevesfactory/logic/execution/ProcedureExecutor.java
- modified: src/main/java/vswe/stevesfactory/logic/item/IItemFilter.java
- modified: src/main/java/vswe/stevesfactory/logic/item/ItemBufferElement.java
- modified: src/main/java/vswe/stevesfactory/logic/item/ItemTagFilter.java
- modified: src/main/java/vswe/stevesfactory/logic/item/ItemTraitsFilter.java
- deleted: src/main/java/vswe/stevesfactory/logic/procedure/BatchedItemTransferProcedure.java
- modified: src/main/java/vswe/stevesfactory/logic/procedure/ItemExportProcedure.java
- modified: src/main/java/vswe/stevesfactory/logic/procedure/ItemImportProcedure.java
- deleted: src/main/java/vswe/stevesfactory/logic/procedure/TimedTriggerProcedure.java
- modified: src/main/java/vswe/stevesfactory/network/NetworkHandler.java
- modified: src/main/java/vswe/stevesfactory/network/PacketSyncCommandGraphs.java
- modified: src/main/java/vswe/stevesfactory/ui/manager/FactoryManagerGUI.java
- modified: src/main/java/vswe/stevesfactory/ui/manager/UserPreferencesPanel.java
- modified: src/main/java/vswe/stevesfactory/ui/manager/editor/EditorPanel.java
- modified: src/main/java/vswe/stevesfactory/ui/manager/editor/OffsetText.java
- modified: src/main/java/vswe/stevesfactory/ui/manager/editor/PropertyManager.java
- deleted: src/main/java/vswe/stevesfactory/ui/manager/menu/FilterSettings.java
- modified: src/main/java/vswe/stevesfactory/ui/manager/menu/FilterSlot.java
- modified: src/main/java/vswe/stevesfactory/ui/manager/menu/IntervalMenu.java
- modified: src/main/java/vswe/stevesfactory/ui/manager/menu/ItemTagFilterMenu.java
- modified: src/main/java/vswe/stevesfactory/ui/manager/menu/ItemTraitsFilterMenu.java
- modified: src/main/java/vswe/stevesfactory/ui/manager/selection/ComponentGroup.java
- modified: src/main/java/vswe/stevesfactory/ui/manager/selection/GroupComponentChoice.java
- modified: src/main/java/vswe/stevesfactory/ui/manager/selection/IComponentChoice.java
- modified: src/main/java/vswe/stevesfactory/utils/IOHelper.java
- modified: src/main/java/vswe/stevesfactory/utils/NetworkHelper.java
- modified: src/main/resources/assets/sfm/component_groups/item_io.json
- modified: src/main/resources/assets/sfm/component_groups/trigger.json
- modified: src/main/resources/assets/sfm/lang/en_us.json
- deleted: src/main/resources/assets/sfm/textures/gui/component_icon/batched_item_transfer.png
- deleted: src/main/resources/assets/sfm/textures/gui/component_icon/timed_trigger.png
- Dropped refs/stash@{0} (777e2b6ed0fa6c36c57623aa850d3d38d79e0fa4)
- [ul_708@hpZ600Workstation StevesFactoryManager]$ git stahs list
- git: 'stahs' is not a git command. See 'git --help'.
- The most similar command is
- stash
- [ul_708@hpZ600Workstation StevesFactoryManager]$ git stash list
- stash@{0}: WIP on 1.14: 7779206 Merge branch '1.14' of https://github.com/gigabit101/StevesFactoryManager into 1.14
- [ul_708@hpZ600Workstation StevesFactoryManager]$ git add .
- [ul_708@hpZ600Workstation StevesFactoryManager]$ git commit
- [1.14 ae3bacf] Merge and finish changes from the last a few commits
- 61 files changed, 1195 insertions(+), 672 deletions(-)
- create mode 100644 src/main/java/vswe/stevesfactory/Config.java
- create mode 100644 src/main/java/vswe/stevesfactory/api/item/IItemBufferElement.java
- rename src/main/java/vswe/stevesfactory/library/gui/contextmenu/{AbstractEntry.java => DefaultEntry.java} (89%)
- create mode 100644 src/main/java/vswe/stevesfactory/logic/item/CraftingBufferElement.java
- rename src/main/java/vswe/stevesfactory/logic/procedure/{TimedTriggerProcedure.java => IntervalTriggerProcedure.java} (73%)
- rename src/main/java/vswe/stevesfactory/logic/procedure/{BatchedItemTransferProcedure.java => ItemTransferProcedure.java} (91%)
- create mode 100644 src/main/java/vswe/stevesfactory/network/PacketInspectionsSetting.java
- create mode 100644 src/main/java/vswe/stevesfactory/network/PacketReloadComponentGroups.java
- delete mode 100644 src/main/java/vswe/stevesfactory/ui/manager/menu/FilterSettings.java
- create mode 100644 src/main/java/vswe/stevesfactory/ui/manager/menu/MultiLayerMenu.java
- create mode 100644 src/main/java/vswe/stevesfactory/ui/manager/menu/SettingsEditor.java
- create mode 100644 src/main/resources/assets/sfm/textures/gui/component_icon/interval_trigger.png
- create mode 100644 src/main/resources/assets/sfm/textures/gui/component_icon/item_io.png
- rename src/main/resources/assets/sfm/textures/gui/component_icon/{batched_item_transfer.png => item_transfer.png} (100%)
- delete mode 100644 src/main/resources/assets/sfm/textures/gui/component_icon/timed_trigger.png
- [ul_708@hpZ600Workstation StevesFactoryManager]$ git push origin HEAD
- Username for 'https://github.com': hnOsmium0001
- Password for 'https://hnOsmium0001@github.com':
- To https://github.com/gigabit101/StevesFactoryManager.git
- ! [rejected] HEAD -> 1.14 (non-fast-forward)
- error: failed to push some refs to 'https://github.com/gigabit101/StevesFactoryManager.git'
- hint: Updates were rejected because the tip of your current branch is behind
- hint: its remote counterpart. Integrate the remote changes (e.g.
- hint: 'git pull ...') before pushing again.
- hint: See the 'Note about fast-forwards' in 'git push --help' for details.
- [ul_708@hpZ600Workstation StevesFactoryManager]$ git push origin HEAD --force
- Username for 'https://github.com': hnOsmium0001
- Password for 'https://hnOsmium0001@github.com':
- Enumerating objects: 173, done.
- Counting objects: 100% (173/173), done.
- Delta compression using up to 12 threads
- Compressing objects: 100% (91/91), done.
- Writing objects: 100% (96/96), 30.91 KiB | 2.58 MiB/s, done.
- Total 96 (delta 58), reused 0 (delta 0)
- remote: Resolving deltas: 100% (58/58), completed with 54 local objects.
- To https://github.com/gigabit101/StevesFactoryManager.git
- + c098472...ae3bacf HEAD -> 1.14 (forced update)
- [ul_708@hpZ600Workstation StevesFactoryManager]$ git log
- commit ae3bacf5d155fe80d33ab5bff7b63cb5c8414ea1 (HEAD -> 1.14, origin/1.14)
- Author: hnOsmium0001 <36975818+hnOsmium0001@users.noreply.github.com>
- Date: Sun Oct 6 18:48:56 2019 -0700
- Merge and finish changes from the last a few commits
- commit 2dcca1d429674961214a42ba11e688133824adcb
- Author: hnOsmium0001 <<U+0096><U+0083><U+0083><U+0096>36975818+hnOsmium0001@users.noreply.github.com>
- Date: Mon Sep 23 13:40:13 2019 -0700
- Fix menus not collpased on creation, fix stack size limiting
- Renamed ActionMenu to ContextMenu for consistency with the complete GUI
- lib
- commit d6b22b86ed294833fd79bb89f5f8cfbfb5c659dd
- Author: hnOsmium0001 <36975818+hnOsmium0001@users.noreply.github.com>
- Date: Mon Sep 23 13:05:56 2019 -0700
- Add stack size limiting
- commit 4d297bc25fa27555a2781b259f1d944e303f12ef
- Author: hnOsmium0001 <36975818+hnOsmium0001@users.noreply.github.com>
- Date: Sun Sep 22 21:12:44 2019 -0700
- Added textures for future porting, fixed #79
- - manually implemented getPos() again in FactoryManagerTileEntity
- commit 342daee534d3cb81105bff4d332efdf1a6a864c3
- Author: hnOsmium0001 <36975818+hnOsmium0001@users.noreply.github.com>
- Date: Sun Sep 22 14:18:00 2019 -0700
- Drastically simplify network scanning logic
- commit ea6f57e9c013d0ce7f7d3634e906e07a3ac53819
- Merge: d50abbb a6d9002
- Author: hnOsmium0001 <36975818+hnOsmium0001@users.noreply.github.com>
- Date: Sun Sep 22 10:53:40 2019 -0700
- [ul_708@hpZ600Workstation StevesFactoryManager]$ ^C
- [ul_708@hpZ600Workstation StevesFactoryManager]$ git stash list
- stash@{0}: WIP on 1.14: 7779206 Merge branch '1.14' of https://github.com/gigabit101/StevesFactoryManager into 1.14
- [ul_708@hpZ600Workstation StevesFactoryManager]$ git rebase -i d6b22b86ed294833fd79bb89f5f8cfbfb5c659dd
- Stopped at 2dcca1d... Fix menus not collpased on creation, fix stack size limiting Renamed ActionMenu to ContextMenu for consistency with the complete GUI lib
- You can amend the commit now, with
- git commit --amend
- Once you are satisfied with your changes, run
- git rebase --continue
- [ul_708@hpZ600Workstation StevesFactoryManager]$ git log
- commit 2dcca1d429674961214a42ba11e688133824adcb (HEAD)
- Author: hnOsmium0001 <<U+0096><U+0083><U+0083><U+0096>36975818+hnOsmium0001@users.noreply.github.com>
- Date: Mon Sep 23 13:40:13 2019 -0700
- Fix menus not collpased on creation, fix stack size limiting
- Renamed ActionMenu to ContextMenu for consistency with the complete GUI
- lib
- commit d6b22b86ed294833fd79bb89f5f8cfbfb5c659dd
- Author: hnOsmium0001 <36975818+hnOsmium0001@users.noreply.github.com>
- Date: Mon Sep 23 13:05:56 2019 -0700
- Add stack size limiting
- commit 4d297bc25fa27555a2781b259f1d944e303f12ef
- Author: hnOsmium0001 <36975818+hnOsmium0001@users.noreply.github.com>
- Date: Sun Sep 22 21:12:44 2019 -0700
- Added textures for future porting, fixed #79
- - manually implemented getPos() again in FactoryManagerTileEntity
- commit 342daee534d3cb81105bff4d332efdf1a6a864c3
- Author: hnOsmium0001 <36975818+hnOsmium0001@users.noreply.github.com>
- Date: Sun Sep 22 14:18:00 2019 -0700
- Drastically simplify network scanning logic
- commit ea6f57e9c013d0ce7f7d3634e906e07a3ac53819
- Merge: d50abbb a6d9002
- Author: hnOsmium0001 <36975818+hnOsmium0001@users.noreply.github.com>
- Date: Sun Sep 22 10:53:40 2019 -0700
- Merge branch 'BufferedItemIO' into 1.14
- commit a6d9002a0d7d03721c6d6de90be9d42bfb917131
- Author: hnOsmium0001 <36975818+hnOsmium0001@users.noreply.github.com>
- Date: Sun Sep 22 10:51:03 2019 -0700
- [ul_708@hpZ600Workstation StevesFactoryManager]$ git commit --author="hnOsmium0001 <36975818+hnOsmium0001@users.noreply.github.com>"
- interactive rebase in progress; onto d6b22b8
- Last command done (1 command done):
- edit 2dcca1d Fix menus not collpased on creation, fix stack size limiting Renamed ActionMenu to ContextMenu for consistency with the complete GUI lib
- Next command to do (1 remaining command):
- pick ae3bacf Merge and finish changes from the last a few commits
- You are currently editing a commit while rebasing branch '1.14' on 'd6b22b8'.
- nothing to commit, working tree clean
- [ul_708@hpZ600Workstation StevesFactoryManager]$ git rebase --continue
- Successfully rebased and updated refs/heads/1.14.
- [ul_708@hpZ600Workstation StevesFactoryManager]$ git log
- commit ae3bacf5d155fe80d33ab5bff7b63cb5c8414ea1 (HEAD -> 1.14, origin/1.14)
- Author: hnOsmium0001 <36975818+hnOsmium0001@users.noreply.github.com>
- Date: Sun Oct 6 18:48:56 2019 -0700
- Merge and finish changes from the last a few commits
- commit 2dcca1d429674961214a42ba11e688133824adcb
- Author: hnOsmium0001 <<U+0096><U+0083><U+0083><U+0096>36975818+hnOsmium0001@users.noreply.github.com>
- Date: Mon Sep 23 13:40:13 2019 -0700
- Fix menus not collpased on creation, fix stack size limiting
- Renamed ActionMenu to ContextMenu for consistency with the complete GUI
- lib
- commit d6b22b86ed294833fd79bb89f5f8cfbfb5c659dd
- Author: hnOsmium0001 <36975818+hnOsmium0001@users.noreply.github.com>
- Date: Mon Sep 23 13:05:56 2019 -0700
- Add stack size limiting
- commit 4d297bc25fa27555a2781b259f1d944e303f12ef
- Author: hnOsmium0001 <36975818+hnOsmium0001@users.noreply.github.com>
- Date: Sun Sep 22 21:12:44 2019 -0700
- Added textures for future porting, fixed #79
- - manually implemented getPos() again in FactoryManagerTileEntity
- commit 342daee534d3cb81105bff4d332efdf1a6a864c3
- Author: hnOsmium0001 <36975818+hnOsmium0001@users.noreply.github.com>
- Date: Sun Sep 22 14:18:00 2019 -0700
- Drastically simplify network scanning logic
- commit ea6f57e9c013d0ce7f7d3634e906e07a3ac53819
- Merge: d50abbb a6d9002
- Author: hnOsmium0001 <36975818+hnOsmium0001@users.noreply.github.com>
- Date: Sun Sep 22 10:53:40 2019 -0700
- [ul_708@hpZ600Workstation StevesFactoryManager]$ git log
- commit ae3bacf5d155fe80d33ab5bff7b63cb5c8414ea1 (HEAD -> 1.14, origin/1.14)
- Author: hnOsmium0001 <36975818+hnOsmium0001@users.noreply.github.com>
- Date: Sun Oct 6 18:48:56 2019 -0700
- Merge and finish changes from the last a few commits
- commit 2dcca1d429674961214a42ba11e688133824adcb
- Author: hnOsmium0001 <<U+0096><U+0083><U+0083><U+0096>36975818+hnOsmium0001@users.noreply.github.com>
- Date: Mon Sep 23 13:40:13 2019 -0700
- Fix menus not collpased on creation, fix stack size limiting
- Renamed ActionMenu to ContextMenu for consistency with the complete GUI
- lib
- commit d6b22b86ed294833fd79bb89f5f8cfbfb5c659dd
- Author: hnOsmium0001 <36975818+hnOsmium0001@users.noreply.github.com>
- Date: Mon Sep 23 13:05:56 2019 -0700
- Add stack size limiting
- commit 4d297bc25fa27555a2781b259f1d944e303f12ef
- Author: hnOsmium0001 <36975818+hnOsmium0001@users.noreply.github.com>
- Date: Sun Sep 22 21:12:44 2019 -0700
- Added textures for future porting, fixed #79
- - manually implemented getPos() again in FactoryManagerTileEntity
- commit 342daee534d3cb81105bff4d332efdf1a6a864c3
- Author: hnOsmium0001 <36975818+hnOsmium0001@users.noreply.github.com>
- Date: Sun Sep 22 14:18:00 2019 -0700
- Drastically simplify network scanning logic
- commit ea6f57e9c013d0ce7f7d3634e906e07a3ac53819
- Merge: d50abbb a6d9002
- Author: hnOsmium0001 <36975818+hnOsmium0001@users.noreply.github.com>
- Date: Sun Sep 22 10:53:40 2019 -0700
- [ul_708@hpZ600Workstation StevesFactoryManager]$ git reset HEAD~
- Unstaged changes after reset:
- M gradle.properties
- M src/main/java/vswe/stevesfactory/StevesFactoryManager.java
- M src/main/java/vswe/stevesfactory/api/logic/CommandGraph.java
- M src/main/java/vswe/stevesfactory/api/logic/IExecutionContext.java
- M src/main/java/vswe/stevesfactory/api/logic/IProcedure.java
- M src/main/java/vswe/stevesfactory/api/logic/IProcedureClientData.java
- M src/main/java/vswe/stevesfactory/api/logic/IProcedureType.java
- M src/main/java/vswe/stevesfactory/blocks/FactoryManagerTileEntity.java
- D src/main/java/vswe/stevesfactory/library/gui/contextmenu/AbstractEntry.java
- M src/main/java/vswe/stevesfactory/library/gui/contextmenu/CallbackEntry.java
- M src/main/java/vswe/stevesfactory/library/gui/debug/Inspections.java
- M src/main/java/vswe/stevesfactory/library/gui/layout/FlowLayout.java
- M src/main/java/vswe/stevesfactory/library/gui/widget/IWidget.java
- M src/main/java/vswe/stevesfactory/library/gui/widget/NumberField.java
- M src/main/java/vswe/stevesfactory/library/gui/widget/TextButton.java
- M src/main/java/vswe/stevesfactory/library/gui/widget/TextField.java
- M src/main/java/vswe/stevesfactory/library/gui/widget/box/LinearList.java
- M src/main/java/vswe/stevesfactory/library/gui/window/Dialog.java
- M src/main/java/vswe/stevesfactory/logic/AbstractProcedure.java
- M src/main/java/vswe/stevesfactory/logic/Procedures.java
- M src/main/java/vswe/stevesfactory/logic/SimpleProcedureType.java
- M src/main/java/vswe/stevesfactory/logic/execution/ProcedureExecutor.java
- M src/main/java/vswe/stevesfactory/logic/item/IItemFilter.java
- M src/main/java/vswe/stevesfactory/logic/item/ItemBufferElement.java
- M src/main/java/vswe/stevesfactory/logic/item/ItemTagFilter.java
- M src/main/java/vswe/stevesfactory/logic/item/ItemTraitsFilter.java
- D src/main/java/vswe/stevesfactory/logic/procedure/BatchedItemTransferProcedure.java
- M src/main/java/vswe/stevesfactory/logic/procedure/ItemExportProcedure.java
- M src/main/java/vswe/stevesfactory/logic/procedure/ItemImportProcedure.java
- D src/main/java/vswe/stevesfactory/logic/procedure/TimedTriggerProcedure.java
- M src/main/java/vswe/stevesfactory/network/NetworkHandler.java
- M src/main/java/vswe/stevesfactory/network/PacketSyncCommandGraphs.java
- M src/main/java/vswe/stevesfactory/ui/manager/FactoryManagerGUI.java
- M src/main/java/vswe/stevesfactory/ui/manager/UserPreferencesPanel.java
- M src/main/java/vswe/stevesfactory/ui/manager/editor/EditorPanel.java
- M src/main/java/vswe/stevesfactory/ui/manager/editor/OffsetText.java
- M src/main/java/vswe/stevesfactory/ui/manager/editor/PropertyManager.java
- D src/main/java/vswe/stevesfactory/ui/manager/menu/FilterSettings.java
- M src/main/java/vswe/stevesfactory/ui/manager/menu/FilterSlot.java
- M src/main/java/vswe/stevesfactory/ui/manager/menu/IntervalMenu.java
- M src/main/java/vswe/stevesfactory/ui/manager/menu/ItemTagFilterMenu.java
- M src/main/java/vswe/stevesfactory/ui/manager/menu/ItemTraitsFilterMenu.java
- M src/main/java/vswe/stevesfactory/ui/manager/selection/ComponentGroup.java
- M src/main/java/vswe/stevesfactory/ui/manager/selection/GroupComponentChoice.java
- M src/main/java/vswe/stevesfactory/ui/manager/selection/IComponentChoice.java
- M src/main/java/vswe/stevesfactory/utils/IOHelper.java
- M src/main/java/vswe/stevesfactory/utils/NetworkHelper.java
- M src/main/resources/assets/sfm/component_groups/item_io.json
- M src/main/resources/assets/sfm/component_groups/trigger.json
- M src/main/resources/assets/sfm/lang/en_us.json
- D src/main/resources/assets/sfm/textures/gui/component_icon/batched_item_transfer.png
- D src/main/resources/assets/sfm/textures/gui/component_icon/timed_trigger.png
- [ul_708@hpZ600Workstation StevesFactoryManager]$ git reset --hard HEAD
- HEAD is now at 2dcca1d Fix menus not collpased on creation, fix stack size limiting Renamed ActionMenu to ContextMenu for consistency with the complete GUI lib
- [ul_708@hpZ600Workstation StevesFactoryManager]$ git status
- On branch 1.14
- Your branch is behind 'origin/1.14' by 1 commit, and can be fast-forwarded.
- (use "git pull" to update your local branch)
- Untracked files:
- (use "git add <file>..." to include in what will be committed)
- src/main/java/vswe/stevesfactory/Config.java
- src/main/java/vswe/stevesfactory/api/item/
- src/main/java/vswe/stevesfactory/library/gui/contextmenu/DefaultEntry.java
- src/main/java/vswe/stevesfactory/logic/item/CraftingBufferElement.java
- src/main/java/vswe/stevesfactory/logic/procedure/IntervalTriggerProcedure.java
- src/main/java/vswe/stevesfactory/logic/procedure/ItemTransferProcedure.java
- src/main/java/vswe/stevesfactory/network/PacketInspectionsSetting.java
- src/main/java/vswe/stevesfactory/network/PacketReloadComponentGroups.java
- src/main/java/vswe/stevesfactory/ui/manager/menu/MultiLayerMenu.java
- src/main/java/vswe/stevesfactory/ui/manager/menu/SettingsEditor.java
- src/main/resources/assets/sfm/textures/gui/component_icon/interval_trigger.png
- src/main/resources/assets/sfm/textures/gui/component_icon/item_io.png
- src/main/resources/assets/sfm/textures/gui/component_icon/item_transfer.png
- nothing added to commit but untracked files present (use "git add" to track)
- [ul_708@hpZ600Workstation StevesFactoryManager]$ git checkout .
- Updated 0 paths from the index
- [ul_708@hpZ600Workstation StevesFactoryManager]$ git status
- On branch 1.14
- Your branch is behind 'origin/1.14' by 1 commit, and can be fast-forwarded.
- (use "git pull" to update your local branch)
- Untracked files:
- (use "git add <file>..." to include in what will be committed)
- src/main/java/vswe/stevesfactory/Config.java
- src/main/java/vswe/stevesfactory/api/item/
- src/main/java/vswe/stevesfactory/library/gui/contextmenu/DefaultEntry.java
- src/main/java/vswe/stevesfactory/logic/item/CraftingBufferElement.java
- src/main/java/vswe/stevesfactory/logic/procedure/IntervalTriggerProcedure.java
- src/main/java/vswe/stevesfactory/logic/procedure/ItemTransferProcedure.java
- src/main/java/vswe/stevesfactory/network/PacketInspectionsSetting.java
- src/main/java/vswe/stevesfactory/network/PacketReloadComponentGroups.java
- src/main/java/vswe/stevesfactory/ui/manager/menu/MultiLayerMenu.java
- src/main/java/vswe/stevesfactory/ui/manager/menu/SettingsEditor.java
- src/main/resources/assets/sfm/textures/gui/component_icon/interval_trigger.png
- src/main/resources/assets/sfm/textures/gui/component_icon/item_io.png
- src/main/resources/assets/sfm/textures/gui/component_icon/item_transfer.png
- nothing added to commit but untracked files present (use "git add" to track)
- [ul_708@hpZ600Workstation StevesFactoryManager]$ git add .
- [ul_708@hpZ600Workstation StevesFactoryManager]$ git reset --hard HEAD
- HEAD is now at 2dcca1d Fix menus not collpased on creation, fix stack size limiting Renamed ActionMenu to ContextMenu for consistency with the complete GUI lib
- [ul_708@hpZ600Workstation StevesFactoryManager]$ git status
- On branch 1.14
- Your branch is behind 'origin/1.14' by 1 commit, and can be fast-forwarded.
- (use "git pull" to update your local branch)
- nothing to commit, working tree clean
- [ul_708@hpZ600Workstation StevesFactoryManager]$ git log
- commit 2dcca1d429674961214a42ba11e688133824adcb (HEAD -> 1.14)
- Author: hnOsmium0001 <<U+0096><U+0083><U+0083><U+0096>36975818+hnOsmium0001@users.noreply.github.com>
- Date: Mon Sep 23 13:40:13 2019 -0700
- Fix menus not collpased on creation, fix stack size limiting
- Renamed ActionMenu to ContextMenu for consistency with the complete GUI
- lib
- commit d6b22b86ed294833fd79bb89f5f8cfbfb5c659dd
- Author: hnOsmium0001 <36975818+hnOsmium0001@users.noreply.github.com>
- Date: Mon Sep 23 13:05:56 2019 -0700
- Add stack size limiting
- commit 4d297bc25fa27555a2781b259f1d944e303f12ef
- Author: hnOsmium0001 <36975818+hnOsmium0001@users.noreply.github.com>
- Date: Sun Sep 22 21:12:44 2019 -0700
- Added textures for future porting, fixed #79
- - manually implemented getPos() again in FactoryManagerTileEntity
- commit 342daee534d3cb81105bff4d332efdf1a6a864c3
- Author: hnOsmium0001 <36975818+hnOsmium0001@users.noreply.github.com>
- Date: Sun Sep 22 14:18:00 2019 -0700
- Drastically simplify network scanning logic
- commit ea6f57e9c013d0ce7f7d3634e906e07a3ac53819
- Merge: d50abbb a6d9002
- Author: hnOsmium0001 <36975818+hnOsmium0001@users.noreply.github.com>
- Date: Sun Sep 22 10:53:40 2019 -0700
- Merge branch 'BufferedItemIO' into 1.14
- commit a6d9002a0d7d03721c6d6de90be9d42bfb917131
- Author: hnOsmium0001 <36975818+hnOsmium0001@users.noreply.github.com>
- Date: Sun Sep 22 10:51:03 2019 -0700
- [ul_708@hpZ600Workstation StevesFactoryManager]$ git pull fork 1.14
- From https://github.com/hnOsmium0001/StevesFactoryManager
- * branch 1.14 -> FETCH_HEAD
- Removing src/main/resources/assets/sfm/textures/gui/component_icon/timed_trigger.png
- Auto-merging src/main/resources/assets/sfm/lang/en_us.json
- CONFLICT (content): Merge conflict in src/main/resources/assets/sfm/lang/en_us.json
- Auto-merging src/main/java/vswe/stevesfactory/ui/manager/selection/GroupComponentChoice.java
- CONFLICT (content): Merge conflict in src/main/java/vswe/stevesfactory/ui/manager/selection/GroupComponentChoice.java
- Auto-merging src/main/java/vswe/stevesfactory/ui/manager/menu/FilterSlot.java
- Removing src/main/java/vswe/stevesfactory/ui/manager/menu/FilterSettings.java
- Auto-merging src/main/java/vswe/stevesfactory/ui/manager/editor/PropertyManager.java
- Auto-merging src/main/java/vswe/stevesfactory/ui/manager/editor/EditorPanel.java
- Auto-merging src/main/java/vswe/stevesfactory/ui/manager/UserPreferencesPanel.java
- CONFLICT (content): Merge conflict in src/main/java/vswe/stevesfactory/ui/manager/UserPreferencesPanel.java
- Auto-merging src/main/java/vswe/stevesfactory/ui/manager/FactoryManagerGUI.java
- Auto-merging src/main/java/vswe/stevesfactory/logic/procedure/ItemExportProcedure.java
- CONFLICT (content): Merge conflict in src/main/java/vswe/stevesfactory/logic/procedure/ItemExportProcedure.java
- Auto-merging src/main/java/vswe/stevesfactory/logic/item/ItemTraitsFilter.java
- Auto-merging src/main/java/vswe/stevesfactory/library/gui/contextmenu/IEntry.java
- Auto-merging src/main/java/vswe/stevesfactory/library/gui/contextmenu/ContextMenu.java
- Auto-merging src/main/java/vswe/stevesfactory/library/gui/contextmenu/CallbackEntry.java
- CONFLICT (rename/rename): Rename "src/main/java/vswe/stevesfactory/library/gui/actionmenu/AbstractEntry.java"->"src/main/java/vswe/stevesfactory/library/gui/contextmenu/AbstractEntry.java" in branch "HEAD" rename "src/main/java/vswe/stevesfactory/library/gui/actionmenu/AbstractEntry.java"->"src/main/java/vswe/stevesfactory/library/gui/contextmenu/DefaultEntry.java" in "c94bea543e3dc7aff243527340665f323cbf1538"
- Auto-merging src/main/java/vswe/stevesfactory/library/gui/contextmenu/AbstractEntry.java and src/main/java/vswe/stevesfactory/library/gui/contextmenu/DefaultEntry.java, both renamed from src/main/java/vswe/stevesfactory/library/gui/actionmenu/AbstractEntry.java
- Automatic merge failed; fix conflicts and then commit the result.
- [ul_708@hpZ600Workstation StevesFactoryManager]$ git merge --abort
- [ul_708@hpZ600Workstation StevesFactoryManager]$ git status
- On branch 1.14
- Your branch is behind 'origin/1.14' by 1 commit, and can be fast-forwarded.
- (use "git pull" to update your local branch)
- nothing to commit, working tree clean
- [ul_708@hpZ600Workstation StevesFactoryManager]$ git log
- commit 2dcca1d429674961214a42ba11e688133824adcb (HEAD -> 1.14)
- Author: hnOsmium0001 <<U+0096><U+0083><U+0083><U+0096>36975818+hnOsmium0001@users.noreply.github.com>
- Date: Mon Sep 23 13:40:13 2019 -0700
- Fix menus not collpased on creation, fix stack size limiting
- Renamed ActionMenu to ContextMenu for consistency with the complete GUI
- lib
- commit d6b22b86ed294833fd79bb89f5f8cfbfb5c659dd
- Author: hnOsmium0001 <36975818+hnOsmium0001@users.noreply.github.com>
- Date: Mon Sep 23 13:05:56 2019 -0700
- Add stack size limiting
- commit 4d297bc25fa27555a2781b259f1d944e303f12ef
- Author: hnOsmium0001 <36975818+hnOsmium0001@users.noreply.github.com>
- Date: Sun Sep 22 21:12:44 2019 -0700
- Added textures for future porting, fixed #79
- - manually implemented getPos() again in FactoryManagerTileEntity
- commit 342daee534d3cb81105bff4d332efdf1a6a864c3
- Author: hnOsmium0001 <36975818+hnOsmium0001@users.noreply.github.com>
- Date: Sun Sep 22 14:18:00 2019 -0700
- Drastically simplify network scanning logic
- commit ea6f57e9c013d0ce7f7d3634e906e07a3ac53819
- Merge: d50abbb a6d9002
- Author: hnOsmium0001 <36975818+hnOsmium0001@users.noreply.github.com>
- Date: Sun Sep 22 10:53:40 2019 -0700
- Merge branch 'BufferedItemIO' into 1.14
- commit a6d9002a0d7d03721c6d6de90be9d42bfb917131
- Author: hnOsmium0001 <36975818+hnOsmium0001@users.noreply.github.com>
- Date: Sun Sep 22 10:51:03 2019 -0700
- [ul_708@hpZ600Workstation StevesFactoryManager]$ git reset HEAD~
- Unstaged changes after reset:
- D src/main/java/vswe/stevesfactory/library/gui/actionmenu/AbstractEntry.java
- D src/main/java/vswe/stevesfactory/library/gui/actionmenu/ActionMenu.java
- D src/main/java/vswe/stevesfactory/library/gui/actionmenu/CallbackEntry.java
- D src/main/java/vswe/stevesfactory/library/gui/actionmenu/IEntry.java
- M src/main/java/vswe/stevesfactory/library/gui/window/PlayerInventoryWindow.java
- M src/main/java/vswe/stevesfactory/logic/item/ItemTraitsFilter.java
- M src/main/java/vswe/stevesfactory/logic/procedure/ItemExportProcedure.java
- M src/main/java/vswe/stevesfactory/ui/manager/FactoryManagerGUI.java
- M src/main/java/vswe/stevesfactory/ui/manager/UserPreferencesPanel.java
- M src/main/java/vswe/stevesfactory/ui/manager/editor/EditorPanel.java
- M src/main/java/vswe/stevesfactory/ui/manager/editor/FlowComponent.java
- M src/main/java/vswe/stevesfactory/ui/manager/editor/Menu.java
- M src/main/java/vswe/stevesfactory/ui/manager/editor/PropertyManager.java
- M src/main/java/vswe/stevesfactory/ui/manager/menu/BlockTarget.java
- M src/main/java/vswe/stevesfactory/ui/manager/menu/FilterSlot.java
- M src/main/java/vswe/stevesfactory/ui/manager/selection/GroupComponentChoice.java
- M src/main/resources/assets/sfm/lang/en_us.json
- [ul_708@hpZ600Workstation StevesFactoryManager]$ git reset --hard HEAD
- HEAD is now at d6b22b8 Add stack size limiting
- [ul_708@hpZ600Workstation StevesFactoryManager]$ git status
- On branch 1.14
- Your branch is behind 'origin/1.14' by 2 commits, and can be fast-forwarded.
- (use "git pull" to update your local branch)
- Untracked files:
- (use "git add <file>..." to include in what will be committed)
- src/main/java/vswe/stevesfactory/library/gui/contextmenu/
- nothing added to commit but untracked files present (use "git add" to track)
- [ul_708@hpZ600Workstation StevesFactoryManager]$ git reset --hard HEAD
- HEAD is now at d6b22b8 Add stack size limiting
- [ul_708@hpZ600Workstation StevesFactoryManager]$ git status
- On branch 1.14
- Your branch is behind 'origin/1.14' by 2 commits, and can be fast-forwarded.
- (use "git pull" to update your local branch)
- Untracked files:
- (use "git add <file>..." to include in what will be committed)
- src/main/java/vswe/stevesfactory/library/gui/contextmenu/
- nothing added to commit but untracked files present (use "git add" to track)
- [ul_708@hpZ600Workstation StevesFactoryManager]$ git add .
- [ul_708@hpZ600Workstation StevesFactoryManager]$ git reset --hard HEAD
- HEAD is now at d6b22b8 Add stack size limiting
- [ul_708@hpZ600Workstation StevesFactoryManager]$ git add .
- [ul_708@hpZ600Workstation StevesFactoryManager]$ git add .
- [ul_708@hpZ600Workstation StevesFactoryManager]$ git status
- On branch 1.14
- Your branch is behind 'origin/1.14' by 2 commits, and can be fast-forwarded.
- (use "git pull" to update your local branch)
- nothing to commit, working tree clean
- [ul_708@hpZ600Workstation StevesFactoryManager]$ git pull fork 1.14
- From https://github.com/hnOsmium0001/StevesFactoryManager
- * branch 1.14 -> FETCH_HEAD
- Updating d6b22b8..c94bea5
- Fast-forward
- gradle.properties | 2 +-
- src/main/java/vswe/stevesfactory/Config.java | 98 +++++++++++++++++++++
- src/main/java/vswe/stevesfactory/StevesFactoryManager.java | 52 ++++++++---
- src/main/java/vswe/stevesfactory/api/item/IItemBufferElement.java | 25 ++++++
- src/main/java/vswe/stevesfactory/api/logic/CommandGraph.java | 46 +++++-----
- src/main/java/vswe/stevesfactory/api/logic/IExecutionContext.java | 4 +-
- src/main/java/vswe/stevesfactory/api/logic/IProcedure.java | 5 +-
- src/main/java/vswe/stevesfactory/api/logic/IProcedureClientData.java | 3 +
- src/main/java/vswe/stevesfactory/api/logic/IProcedureType.java | 17 ++--
- src/main/java/vswe/stevesfactory/blocks/FactoryManagerTileEntity.java | 38 ++++----
- .../stevesfactory/library/gui/{actionmenu => contextmenu}/CallbackEntry.java | 8 +-
- .../library/gui/{actionmenu/ActionMenu.java => contextmenu/ContextMenu.java} | 12 +--
- .../gui/{actionmenu/AbstractEntry.java => contextmenu/DefaultEntry.java} | 20 +++--
- .../java/vswe/stevesfactory/library/gui/{actionmenu => contextmenu}/IEntry.java | 4 +-
- src/main/java/vswe/stevesfactory/library/gui/debug/Inspections.java | 3 +-
- src/main/java/vswe/stevesfactory/library/gui/layout/FlowLayout.java | 15 ++--
- src/main/java/vswe/stevesfactory/library/gui/widget/IWidget.java | 7 +-
- src/main/java/vswe/stevesfactory/library/gui/widget/NumberField.java | 60 -------------
- src/main/java/vswe/stevesfactory/library/gui/widget/TextButton.java | 14 ++-
- src/main/java/vswe/stevesfactory/library/gui/widget/TextField.java | 20 ++++-
- src/main/java/vswe/stevesfactory/library/gui/widget/box/LinearList.java | 3 +-
- src/main/java/vswe/stevesfactory/library/gui/window/Dialog.java | 4 +-
- src/main/java/vswe/stevesfactory/library/gui/window/PlayerInventoryWindow.java | 13 +++
- src/main/java/vswe/stevesfactory/logic/AbstractProcedure.java | 41 +++++----
- src/main/java/vswe/stevesfactory/logic/Procedures.java | 72 +++++++++------
- src/main/java/vswe/stevesfactory/logic/SimpleProcedureType.java | 39 +++------
- src/main/java/vswe/stevesfactory/logic/execution/ProcedureExecutor.java | 24 ++---
- src/main/java/vswe/stevesfactory/logic/item/CraftingBufferElement.java | 66 ++++++++++++++
- src/main/java/vswe/stevesfactory/logic/item/IItemFilter.java | 29 ++++++
- src/main/java/vswe/stevesfactory/logic/item/ItemBufferElement.java | 38 +++++++-
- src/main/java/vswe/stevesfactory/logic/item/ItemTagFilter.java | 17 ++++
- src/main/java/vswe/stevesfactory/logic/item/ItemTraitsFilter.java | 20 ++++-
- .../procedure/{TimedTriggerProcedure.java => IntervalTriggerProcedure.java} | 17 ++--
- src/main/java/vswe/stevesfactory/logic/procedure/ItemExportProcedure.java | 79 +++++++----------
- src/main/java/vswe/stevesfactory/logic/procedure/ItemImportProcedure.java | 27 ++++--
- .../procedure/{BatchedItemTransferProcedure.java => ItemTransferProcedure.java} | 20 ++---
- src/main/java/vswe/stevesfactory/network/NetworkHandler.java | 14 +--
- src/main/java/vswe/stevesfactory/network/PacketInspectionsSetting.java | 66 ++++++++++++++
- src/main/java/vswe/stevesfactory/network/PacketReloadComponentGroups.java | 32 +++++++
- src/main/java/vswe/stevesfactory/network/PacketSyncCommandGraphs.java | 19 ++--
- src/main/java/vswe/stevesfactory/ui/manager/FactoryManagerGUI.java | 13 ++-
- src/main/java/vswe/stevesfactory/ui/manager/UserPreferencesPanel.java | 8 +-
- src/main/java/vswe/stevesfactory/ui/manager/editor/EditorPanel.java | 25 +++---
- src/main/java/vswe/stevesfactory/ui/manager/editor/FlowComponent.java | 15 ++--
- src/main/java/vswe/stevesfactory/ui/manager/editor/Menu.java | 6 +-
- src/main/java/vswe/stevesfactory/ui/manager/editor/OffsetText.java | 22 +++--
- src/main/java/vswe/stevesfactory/ui/manager/editor/PropertyManager.java | 4 +-
- src/main/java/vswe/stevesfactory/ui/manager/menu/BlockTarget.java | 8 +-
- src/main/java/vswe/stevesfactory/ui/manager/menu/FilterSettings.java | 80 -----------------
- src/main/java/vswe/stevesfactory/ui/manager/menu/FilterSlot.java | 8 +-
- src/main/java/vswe/stevesfactory/ui/manager/menu/IntervalMenu.java | 17 ++--
- src/main/java/vswe/stevesfactory/ui/manager/menu/ItemTagFilterMenu.java | 26 +++++-
- src/main/java/vswe/stevesfactory/ui/manager/menu/ItemTraitsFilterMenu.java | 165 +++-------------------------------
- src/main/java/vswe/stevesfactory/ui/manager/menu/MultiLayerMenu.java | 175 +++++++++++++++++++++++++++++++++++++
- src/main/java/vswe/stevesfactory/ui/manager/menu/SettingsEditor.java | 104 ++++++++++++++++++++++
- src/main/java/vswe/stevesfactory/ui/manager/selection/ComponentGroup.java | 31 ++++---
- src/main/java/vswe/stevesfactory/ui/manager/selection/GroupComponentChoice.java | 28 ++++--
- src/main/java/vswe/stevesfactory/ui/manager/selection/IComponentChoice.java | 13 +--
- src/main/java/vswe/stevesfactory/utils/IOHelper.java | 43 ++++-----
- src/main/java/vswe/stevesfactory/utils/NetworkHelper.java | 34 ++++---
- src/main/resources/assets/sfm/component_groups/item_io.json | 4 +-
- src/main/resources/assets/sfm/component_groups/trigger.json | 2 +-
- src/main/resources/assets/sfm/lang/en_us.json | 28 +++---
- src/main/resources/assets/sfm/textures/gui/component_icon/interval_trigger.png | Bin 0 -> 2238 bytes
- src/main/resources/assets/sfm/textures/gui/component_icon/item_io.png | Bin 0 -> 2473 bytes
- .../gui/component_icon/{batched_item_transfer.png => item_transfer.png} | Bin
- src/main/resources/assets/sfm/textures/gui/component_icon/timed_trigger.png | Bin 747 -> 0 bytes
- 67 files changed, 1220 insertions(+), 732 deletions(-)
- create mode 100644 src/main/java/vswe/stevesfactory/Config.java
- create mode 100644 src/main/java/vswe/stevesfactory/api/item/IItemBufferElement.java
- rename src/main/java/vswe/stevesfactory/library/gui/{actionmenu => contextmenu}/CallbackEntry.java (68%)
- rename src/main/java/vswe/stevesfactory/library/gui/{actionmenu/ActionMenu.java => contextmenu/ContextMenu.java} (86%)
- rename src/main/java/vswe/stevesfactory/library/gui/{actionmenu/AbstractEntry.java => contextmenu/DefaultEntry.java} (81%)
- rename src/main/java/vswe/stevesfactory/library/gui/{actionmenu => contextmenu}/IEntry.java (88%)
- create mode 100644 src/main/java/vswe/stevesfactory/logic/item/CraftingBufferElement.java
- rename src/main/java/vswe/stevesfactory/logic/procedure/{TimedTriggerProcedure.java => IntervalTriggerProcedure.java} (73%)
- rename src/main/java/vswe/stevesfactory/logic/procedure/{BatchedItemTransferProcedure.java => ItemTransferProcedure.java} (91%)
- create mode 100644 src/main/java/vswe/stevesfactory/network/PacketInspectionsSetting.java
- create mode 100644 src/main/java/vswe/stevesfactory/network/PacketReloadComponentGroups.java
- delete mode 100644 src/main/java/vswe/stevesfactory/ui/manager/menu/FilterSettings.java
- create mode 100644 src/main/java/vswe/stevesfactory/ui/manager/menu/MultiLayerMenu.java
- create mode 100644 src/main/java/vswe/stevesfactory/ui/manager/menu/SettingsEditor.java
- create mode 100644 src/main/resources/assets/sfm/textures/gui/component_icon/interval_trigger.png
- create mode 100644 src/main/resources/assets/sfm/textures/gui/component_icon/item_io.png
- rename src/main/resources/assets/sfm/textures/gui/component_icon/{batched_item_transfer.png => item_transfer.png} (100%)
- delete mode 100644 src/main/resources/assets/sfm/textures/gui/component_icon/timed_trigger.png
- [ul_708@hpZ600Workstation StevesFactoryManager]$ git log
- commit c94bea543e3dc7aff243527340665f323cbf1538 (HEAD -> 1.14, fork/1.14)
- Author: hnOsmium0001 <36975818+hnOsmium0001@users.noreply.github.com>
- Date: Wed Oct 2 13:21:23 2019 -0700
- API cleanup to make it less confusing
- commit 803becd18185723612b04a671693e36586397931
- Author: hnOsmium0001 <36975818+hnOsmium0001@users.noreply.github.com>
- Date: Wed Sep 25 18:39:33 2019 -0700
- Fixed world lock up when a factory manager exists in the world
- commit 36ec32a10de13d2c0ea9255bbbab5e2c1346280c
- Author: hnOsmium0001 <36975818+hnOsmium0001@users.noreply.github.com>
- Date: Wed Sep 25 15:47:01 2019 -0700
- Misc additions and clean up
- - Added context menu for offset status for easy reset to 0
- - Added cable searching depth limit config option
- - Fixed StackOverflowException crash when using factory manager on a long cable
- - Made item export filter defaults to blacklist
- commit 4e14606f85fb285703ab274cb8090ba2eae7678a
- Author: hnOsmium0001 <36975818+hnOsmium0001@users.noreply.github.com>
- Date: Wed Sep 25 13:12:12 2019 -0700
- Bump Forge version to 28.1.20 and misc additions
- commit 0862592298443c2ede1f2090fd8b807c0c53e82d
- Author: hnOsmium0001 <36975818+hnOsmium0001@users.noreply.github.com>
- Date: Mon Sep 23 22:21:29 2019 -0700
- Configs + misc cleanup
- commit 86e651453cbe4325fbfdf0467ca7c223c05ad6f1
- Author: hnOsmium0001 <36975818+hnOsmium0001@users.noreply.github.com>
- Date: Mon Sep 23 13:40:13 2019 -0700
- [ul_708@hpZ600Workstation StevesFactoryManager]$ git stash
- No local changes to save
- [ul_708@hpZ600Workstation StevesFactoryManager]$ git stahs list
- git: 'stahs' is not a git command. See 'git --help'.
- The most similar command is
- stash
- [ul_708@hpZ600Workstation StevesFactoryManager]$ git stash list
- stash@{0}: WIP on 1.14: 7779206 Merge branch '1.14' of https://github.com/gigabit101/StevesFactoryManager into 1.14
- [ul_708@hpZ600Workstation StevesFactoryManager]$ git stash pop
- Auto-merging src/main/java/vswe/stevesfactory/logic/procedure/ItemExportProcedure.java
- CONFLICT (content): Merge conflict in src/main/java/vswe/stevesfactory/logic/procedure/ItemExportProcedure.java
- The stash entry is kept in case you need it again.
- [ul_708@hpZ600Workstation StevesFactoryManager]$ git add .
- [ul_708@hpZ600Workstation StevesFactoryManager]$ git add .
- [ul_708@hpZ600Workstation StevesFactoryManager]$ git commit
- [1.14 8117d0c] Add recipes, loot tables, and fix bugs - Added old recipes for factory manager and cables - Fixed procedure duplication on network (caused on API cleanup) - Breaking factory manager retain its data
- 32 files changed, 265 insertions(+), 197 deletions(-)
- create mode 100644 src/main/resources/META-INF/accesstransformer.cfg
- create mode 100644 src/main/resources/data/sfm/loot_tables/blocks/cable.json
- create mode 100644 src/main/resources/data/sfm/loot_tables/blocks/factory_manager.json
- create mode 100644 src/main/resources/data/sfm/recipes/cable.json
- create mode 100644 src/main/resources/data/sfm/recipes/clear_factory_manager_data.json
- create mode 100644 src/main/resources/data/sfm/recipes/factory_manager.json
- [ul_708@hpZ600Workstation StevesFactoryManager]$ git push origin fork
- error: src refspec fork does not match any
- error: failed to push some refs to 'https://github.com/gigabit101/StevesFactoryManager.git'
- [ul_708@hpZ600Workstation StevesFactoryManager]$ git push fork HEA
- error: src refspec HEA does not match any
- error: failed to push some refs to 'https://github.com/hnOsmium0001/StevesFactoryManager.git'
- [ul_708@hpZ600Workstation StevesFactoryManager]$ git push fork HEAD
- Username for 'https://github.com': hnOsmium0001
- Password for 'https://hnOsmium0001@github.com':
- Enumerating objects: 110, done.
- Counting objects: 100% (110/110), done.
- Delta compression using up to 12 threads
- Compressing objects: 100% (58/58), done.
- Writing objects: 100% (63/63), 10.62 KiB | 1.77 MiB/s, done.
- Total 63 (delta 40), reused 0 (delta 0)
- remote: Resolving deltas: 100% (40/40), completed with 35 local objects.
- To https://github.com/hnOsmium0001/StevesFactoryManager.git
- c94bea5..8117d0c HEAD -> 1.14
- [ul_708@hpZ600Workstation StevesFactoryManager]$ git push origin HEAD -f
- Username for 'https://github.com': hnOsmium0001
- Password for 'https://hnOsmium0001@github.com':
- Enumerating objects: 150, done.
- Counting objects: 100% (150/150), done.
- Delta compression using up to 12 threads
- Compressing objects: 100% (89/89), done.
- Writing objects: 100% (97/97), 15.53 KiB | 1.41 MiB/s, done.
- Total 97 (delta 65), reused 0 (delta 0)
- remote: Resolving deltas: 100% (65/65), completed with 43 local objects.
- To https://github.com/gigabit101/StevesFactoryManager.git
- + ae3bacf...8117d0c HEAD -> 1.14 (forced update)
- [ul_708@hpZ600Workstation StevesFactoryManager]$ git stash list
- stash@{0}: WIP on 1.14: 7779206 Merge branch '1.14' of https://github.com/gigabit101/StevesFactoryManager into 1.14
- [ul_708@hpZ600Workstation StevesFactoryManager]$
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement