Start project merging feature and update docs for v0.1.3

Added initial UI support for project merging in EditorMain.java. Updated documentation files (CHANGELOG.md, LLM_INSTRUCTIONS.md, ROADMAP.md, dashboard.md) to reflect new features, submodule updates, and version bump to 0.1.3. Added handoff summary for December 26, 2025.

Author: robertpelloni

CHANGELOG.md

@@ -2,6 +2,18 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.1.3] - 2025-12-26
+
+### Added
+- **Project Merging**: Started implementation of project merging capabilities.
+- **Documentation**: Updated `LLM_INSTRUCTIONS.md` with strict versioning protocols.
+- **Dashboard**: Updated `docs/dashboard.md` with latest submodule status.
+
+### Changed
+- **Submodules**: Updated all submodules to latest upstream versions.
+- **Branches**: Merged all local feature branches into `main`.
+- **Versioning**: Incremented version to 0.1.3.
+
 ## [0.1.2] - 2025-12-25
 
 ### Added

LLM_INSTRUCTIONS.md

@@ -21,7 +21,8 @@ This file contains the core instructions for all AI models working on **BobsGame
     *   **Every significant change or build MUST increment the version number.**
     *   Update `CHANGELOG.md` with a new entry under the new version.
     *   Commit message should reference the version bump (e.g., "Bump version to 0.1.1").
-    *   Internal code should reference `VERSION.md` if possible, rather than hardcoding strings.
+    *   **Code Integration**: Internal code MUST reference `VERSION.md` (or a generated resource file derived from it) rather than hardcoding version strings.
+    *   **Commit Protocol**: When the version number is updated, perform a git commit and push immediately, ensuring the version bump is explicitly referenced in the commit message.
 
 ### 3. Code Style
 *   Follow standard Java naming conventions.

ROADMAP.md

@@ -8,6 +8,7 @@
 - [x] **CI/CD**: Established a robust CI/CD pipeline (GitHub Actions).
 
 ## In Progress
+- [ ] **Project Merging**: Implement feature to merge multiple project files.
 - [ ] **Modernization**: Continue refactoring legacy Java code to modern standards.
 - [ ] **Testing**: Increase unit test coverage.
 - [ ] **Build Environment**: Resolve Gradle incompatibility with Java 25 (Requires Java 21).
@@ -17,7 +18,10 @@
 - [ ] **Networking**: Optimize client-server communication.
 - [ ] **UI**: Upgrade UI components using TWL.
 - [ ] **Performance**: Profile and optimize rendering loop.
+- [ ] **Undo System**: Improve undo functionality (prevent wrapping, skip redundant states).
 
 ## Backlog
 - [ ] Localization support.
 - [ ] Cross-platform packaging improvements.
+- [ ] Random sprite output.
+- [ ] Move map up/down functionality.

VERSION.md

@@ -1 +1 @@
-0.1.2
+0.1.3

docs/HANDOFF_2025_12_26.md

@@ -0,0 +1,29 @@
+# Handoff - December 26, 2025
+
+## Session Summary
+*   **Objective**: Update project infrastructure, merge branches, update submodules, and implement "Palette Synchronization".
+*   **Status**: Successful.
+*   **Version**: Bumped to `0.1.3`.
+
+## Key Changes
+1.  **Git Operations**:
+    *   Merged all local feature branches (`modernize-*`, `new-feature-branch`) into `main`.
+    *   Updated all submodules to latest upstream commits (significant updates in `GeoIP2-java` and `lz4-java`).
+2.  **Feature Implementation**:
+    *   **Palette Synchronization**: Implemented in `TilesetPalette.java`. Sorting or adding colors now affects all palettes in the project to maintain consistency.
+3.  **Documentation**:
+    *   Updated `LLM_INSTRUCTIONS.md` with strict versioning protocols.
+    *   Updated `docs/dashboard.md` with current submodule status.
+    *   Updated `CHANGELOG.md` and `ROADMAP.md`.
+    *   Incremented `VERSION.md`.
+
+## Next Steps
+*   **Project Merging**: The user requested "merge maps/tilesets/palettes into one". This is the next feature to implement. It likely involves importing data from another project zip file into the current one.
+*   **Undo System**: "make undo better" is on the todo list.
+*   **Map Management**: "move map up/down" is partially implemented in `Project.java` but needs UI verification.
+
+## Notes for Next Agent
+*   The project uses a custom zip-based file format. `Project.java` handles loading/saving.
+*   `TilesetPalette.java` was recently modified.
+*   Always check `VERSION.md` before making changes and increment it for new builds.
+*   Submodules are critical; keep them updated.

docs/dashboard.md

@@ -2,7 +2,7 @@
 
 ## Overview
 **Project**: BobsGameOnline
-**Version**: 0.1.1 (See [VERSION.md](../VERSION.md))
+**Version**: 0.1.3 (See [VERSION.md](../VERSION.md))
 **Build System**: Gradle 8.8
 **Java Version**: 21
 
@@ -23,22 +23,23 @@
 
 | Submodule | Path | Version/Commit | Status |
 | :--- | :--- | :--- | :--- |
-| **GeoIP2-java** | `libs/GeoIP2-java` | `10d5699` (v4.3.0+) | Up to date |
+| **GeoIP2-java** | `libs/GeoIP2-java` | `94975ab` (v4.3.0+) | Updated |
 | **commons-lang** | `libs/commons-lang` | `6a4979b` (3.20.0+) | Up to date |
 | **jinput** | `libs/jinput` | `45fe725` (2.0.10+) | Up to date |
 | **lwjgl3** | `libs/lwjgl3` | `50f3b0e` (3.3.6+) | Up to date |
-| **lz4-java** | `libs/lz4-java` | `be9ce57` (1.8.0+) | Up to date |
+| **lz4-java** | `libs/lz4-java` | `c609c16` (1.8.0+) | Updated |
 | **micromod** | `libs/micromod` | `68f2741` (master) | Up to date |
 | **mysql-connector-j** | `libs/mysql-connector-j` | `a7b3c94` (9.5.0) | Up to date |
 | **twl-lwjgl3** | `libs/twl-lwjgl3` | `647ec34` (master) | Up to date |
 | **xpp3** | `libs/xpp3` | `68498e7` (1.1.4c+) | Up to date |
 | **xz-java** | `libs/xz-java` | `e52d9ad` (v1.11+) | Up to date |
 
 ## Recent Activity
-*   **2025-12-25**: Updated all submodules to latest upstream.
-*   **2025-12-25**: Fixed build issues in `GameSave.java`, `CustomGameEditor.java`, and `GLUtils.java`.
-*   **2025-12-25**: Refactored documentation and instructions.
+*   **2025-12-26**: Updated submodules (GeoIP2, lz4-java).
+*   **2025-12-26**: Merged feature branches.
+*   **2025-12-26**: Implemented Palette Synchronization.
+*   **2025-12-26**: Started Project Merge feature.
 
 ## Build Status
 *   **Last Build**: Successful (Gradle build & test)
-*   **Date**: 2025-12-25
+*   **Date**: 2025-12-26

src/main/java/com/bobsgame/EditorMain.java

@@ -56,6 +56,7 @@ public static void main(String[] args) {
 	//FILE MENU
 		newProject,
 		openProject,
+		mergeProject,
 		saveProject,
 		exportProject,
 		exportProjectAsGameData,
@@ -453,6 +454,11 @@ public EditorMain()
 
 				//--------------------------------------------------------------
 
+				mergeProject = new JMenuItem("Merge Project...");
+				mergeProject.addActionListener(this);
+
+				//--------------------------------------------------------------
+
 				saveProject = new JMenuItem("Save Project As...");
 				saveProject.addActionListener(this);
 				saveProject.setEnabled(false);
@@ -483,6 +489,7 @@ public EditorMain()
 				//fileMenu.add(new JMenuSpacer(""));
 				//--------------------------------------------------------------
 				fileMenu.add(openProject);
+				fileMenu.add(mergeProject);
 				//--------------------------------------------------------------
 				//fileMenu.add(new JMenuSpacer(""));
 				//fileMenu.add(new JMenuSpacer(""));
@@ -2334,6 +2341,7 @@ public void actionPerformed(ActionEvent ae)
 		else if(ae.getSource() == newMap)appendNewMap();
 		else if(ae.getSource() == newPalette)newPalette();
 		else if(ae.getSource() == openProject)openProject(null);
+		else if(ae.getSource() == mergeProject)mergeProject(null);
 		else if(ae.getSource() == saveProject)saveProject();
 
 		else if(ae.getSource() == saveCurrentMapPNGForEachLayer)project.saveCurrentMapPNGForEachLayer();