Skip to content

Commit d1a6460

Browse files
committed
Create 1.1.0 release
1 parent b00629e commit d1a6460

9 files changed

+25
-9
lines changed

README.md

+6-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ The tile merger is a GUI or CLI application that takes a folder full of image fi
55

66
Latest Release
77
--------------
8-
Download [TileMerger_rel_c1.zip](./releases/TileMerger_1.0.0.zip) (28Kb)
8+
Download [TileMerger_1.1.0.zip](./releases/TileMerger_1.1.0.zip) (39Kb)
99

1010
* **Requires .NET 2.0 to run**
1111

@@ -15,7 +15,7 @@ Download [TileMerger_rel_c1.zip](./releases/TileMerger_1.0.0.zip) (28Kb)
1515

1616
### How to use
1717

18-
![image](./c-sharp/build/2023-07-10%20Tile%20Merger%20preview%201.0.0.png)
18+
![image](./c-sharp/build/2023-11-03%20Tile%20Merger%20preview%201.1.0.png)
1919

2020
* **Source directory** - browse to a folder full of images that you want to merge
2121
* **Target file** - name the file you want to create after merging the images
@@ -31,7 +31,7 @@ Download [TileMerger_rel_c1.zip](./releases/TileMerger_1.0.0.zip) (28Kb)
3131

3232
### Command Line Mode
3333

34-
New as of July 2023, you can use TilerMerger from the command line.
34+
New as of version 1.0.0 (July 2023), you can use TilerMerger from the command line.
3535

3636
```
3737
>TileMerger.exe --help
@@ -152,6 +152,9 @@ Written by John Beech
152152
* https://mkv25.net/
153153
* https://github.com/johnbeech/
154154

155+
With contributions and thanks to XtheOne:
156+
- https://github.com/XtheOne
157+
155158
Used on:
156159
* https://mkv25.net/dfma/
157160

c-sharp/ImageMerger/CommandLineInterface.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public void DisplayHelp()
2121
{
2222
var lines = new[] {
2323
"",
24-
"Tile Merger 1.0.0",
24+
"Tile Merger 1.1.0",
2525
"Supported arguments:",
2626
"",
2727
"--src=\"<path>\" Source folder to find files in; also used as base directory to find relative imgs",

c-sharp/ImageMerger/MainForm.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ private void InitializeComponent()
367367
this.MaximizeBox = false;
368368
this.Name = "MainForm";
369369
this.ShowIcon = false;
370-
this.Text = "Tile Merger (Release 1.0.0)";
370+
this.Text = "Tile Merger (Release 1.1.0)";
371371
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainForm_FormClosing);
372372
this.Load += new System.EventHandler(this.MainForm_Load);
373373
((System.ComponentModel.ISupportInitialize)(this.numericUpDownColumns)).EndInit();

c-sharp/TileMerger.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<UpdateRequired>false</UpdateRequired>
2222
<MapFileExtensions>true</MapFileExtensions>
2323
<ApplicationRevision>0</ApplicationRevision>
24-
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
24+
<ApplicationVersion>1.1.0.%2a</ApplicationVersion>
2525
<UseApplicationTrust>false</UseApplicationTrust>
2626
<BootstrapperEnabled>true</BootstrapperEnabled>
2727
</PropertyGroup>
Binary file not shown.
Loading

c-sharp/build/TileMerger.exe

512 Bytes
Binary file not shown.

c-sharp/build/readme.txt

+16-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,19 @@
11
Tile Merger - Updated July 2023
2-
Release 1.0.0
2+
Release 1.1.0
33

44
Requires .NET 2.0 to run
55

66
The tile merger is a GUI application that takes a folder full of image files and mergers them into a single tiled image. Use the columns field to set the number of tiles per row. The image size is automatically calculated based on the source images. Images are sorted by their filename. I suggest using a numeric prefix naming scheme such as "001 tree.png", "002 table.png", "003 chair.png" etc. in order to predictably position images.
77

88
Version history:
99

10-
Release 1.0
10+
Release 1.1.0
11+
12+
o Merged XtheOne's Numeric Sorting branch
13+
o Example Key files F1 to F16 now are ordered correctly:
14+
o F1 -> F9, F10, F11, instead of F1, F10, F11, F2 -> F9
15+
16+
Release 1.0.0
1117
o Added command line arguments
1218
o Fully migrated to Github: https://github.com/Markavian/tile-merger
1319
o Fixed bug with tiling direction to work as intended
@@ -52,10 +58,17 @@ Written by John Beech
5258
https://mkv25.net/
5359
https://github.com/johnbeech/
5460

61+
With contributions and thanks to XtheOne:
62+
- https://github.com/XtheOne
63+
5564
Used on:
5665
https://mkv25.net/dfma/
5766

58-
Contact: csharp@mkv25.net
67+
Contact
68+
o csharp@mkv25.net
69+
o github@mkv25.net
70+
71+
Or raise issue at https://github.com/Markavian/tile-merger/issues
5972

6073
Historically available at:
6174
https://mkv25.net/showcase/

c-sharp/releases/TileMerger_1.1.0.zip

38.3 KB
Binary file not shown.

0 commit comments

Comments
 (0)