Skip to content

Commit d0df602

Browse files
committed
Merge branch 'master' into feat/dataset-loger-improvements
2 parents 6244af4 + 5a345da commit d0df602

15 files changed

+27
-92
lines changed

megamek/docs/history.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ MEGAMEK VERSION HISTORY:
2929
+ Fix #6751: Princess will now deploy mines on her turn instead of at the start of the phase.
3030
+ PR #6829: Expanded MathUtility Integer Parsing
3131
+ PR #6832: Corrects custom armor calculation required for megameklab#1820 that fixes megameklab#1808: Conventional infantry custom armor not appearring on record sheet
32-
+ PR #6835 Fixed issue with Ammo Counts showing 0 when configuring from Lobby
32+
+ PR #6835: Fixed issue with Ammo Counts showing 0 when configuring from Lobby
33+
+ PR #6837: Removes broken event from server
3334

3435
0.50.04 (2025-03-22 1600 UTC)
3536
+ PR #6494: Cap splashscreen button width

megamek/src/megamek/ai/dataset/TabSeparatedValueSerializer.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
/*
2-
* Copyright (C) 2017-2025 The MegaMek Team. All Rights Reserved.
2+
* Copyright (C) 2025 The MegaMek Team. All Rights Reserved.
33
*
44
* This file is part of MegaMek.
55
*
6+
*
67
* MegaMek is free software: you can redistribute it and/or modify
78
* it under the terms of the GNU General Public License (GPL),
89
* version 3 or (at your option) any later version,

megamek/src/megamek/ai/dataset/UnitAction.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
/*
2-
* Copyright (C) 2017-2025 The MegaMek Team. All Rights Reserved.
2+
* Copyright (C) 2025 The MegaMek Team. All Rights Reserved.
33
*
44
* This file is part of MegaMek.
55
*
6+
*
67
* MegaMek is free software: you can redistribute it and/or modify
78
* it under the terms of the GNU General Public License (GPL),
89
* version 3 or (at your option) any later version,

megamek/src/megamek/ai/dataset/UnitActionField.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
/*
2-
* Copyright (C) 2017-2025 The MegaMek Team. All Rights Reserved.
2+
* Copyright (C) 2025 The MegaMek Team. All Rights Reserved.
33
*
44
* This file is part of MegaMek.
55
*
6+
*
67
* MegaMek is free software: you can redistribute it and/or modify
78
* it under the terms of the GNU General Public License (GPL),
89
* version 3 or (at your option) any later version,

megamek/src/megamek/ai/dataset/UnitActionSerializer.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
/*
2-
* Copyright (C) 2017-2025 The MegaMek Team. All Rights Reserved.
2+
* Copyright (C) 2025 The MegaMek Team. All Rights Reserved.
33
*
44
* This file is part of MegaMek.
55
*
6+
*
67
* MegaMek is free software: you can redistribute it and/or modify
78
* it under the terms of the GNU General Public License (GPL),
89
* version 3 or (at your option) any later version,

megamek/src/megamek/ai/dataset/UnitAttackAction.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
/*
2-
* Copyright (C) 2017-2025 The MegaMek Team. All Rights Reserved.
2+
* Copyright (C) 2025 The MegaMek Team. All Rights Reserved.
33
*
44
* This file is part of MegaMek.
55
*
6+
*
67
* MegaMek is free software: you can redistribute it and/or modify
78
* it under the terms of the GNU General Public License (GPL),
89
* version 3 or (at your option) any later version,

megamek/src/megamek/ai/dataset/UnitAttackField.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
/*
2-
* Copyright (C) 2017-2025 The MegaMek Team. All Rights Reserved.
2+
* Copyright (C) 2025 The MegaMek Team. All Rights Reserved.
33
*
44
* This file is part of MegaMek.
55
*
6+
*
67
* MegaMek is free software: you can redistribute it and/or modify
78
* it under the terms of the GNU General Public License (GPL),
89
* version 3 or (at your option) any later version,

megamek/src/megamek/ai/dataset/UnitAttackSerializer.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
/*
2-
* Copyright (C) 2017-2025 The MegaMek Team. All Rights Reserved.
2+
* Copyright (C) 2025 The MegaMek Team. All Rights Reserved.
33
*
44
* This file is part of MegaMek.
55
*
6+
*
67
* MegaMek is free software: you can redistribute it and/or modify
78
* it under the terms of the GNU General Public License (GPL),
89
* version 3 or (at your option) any later version,

megamek/src/megamek/ai/dataset/UnitState.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
/*
2-
* Copyright (C) 2017-2025 The MegaMek Team. All Rights Reserved.
2+
* Copyright (C) 2025 The MegaMek Team. All Rights Reserved.
33
*
44
* This file is part of MegaMek.
55
*
6+
*
67
* MegaMek is free software: you can redistribute it and/or modify
78
* it under the terms of the GNU General Public License (GPL),
89
* version 3 or (at your option) any later version,

megamek/src/megamek/ai/dataset/UnitStateField.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
/*
2-
* Copyright (C) 2017-2025 The MegaMek Team. All Rights Reserved.
2+
* Copyright (C) 2025 The MegaMek Team. All Rights Reserved.
33
*
44
* This file is part of MegaMek.
55
*
6+
*
67
* MegaMek is free software: you can redistribute it and/or modify
78
* it under the terms of the GNU General Public License (GPL),
89
* version 3 or (at your option) any later version,

0 commit comments

Comments
 (0)