Skip to content

Commit

Permalink
Merge pull request #62 from kbuma/release-3.1.0-prep
Browse files Browse the repository at this point in the history
bumping to version 3.1.0.0 and year 2024
  • Loading branch information
kbuma authored Jun 18, 2024
2 parents ae5a378 + a38bf22 commit 2d07cb3
Show file tree
Hide file tree
Showing 15 changed files with 196 additions and 196 deletions.
6 changes: 3 additions & 3 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
Copyright and License
=====================

Copyright (c) 2012 - 2023
Copyright (c) 2012 - 2024

Copyright Notice
----------------

SimSinter was produced under the DOE Carbon Capture Simulation Initiative (CCSI), and is copyright
(c) 2012 - 2023 by the software owners: Oak Ridge Institute for Science and Education (ORISE), TRIAD
(c) 2012 - 2024 by the software owners: Oak Ridge Institute for Science and Education (ORISE), TRIAD
National Security, LLC., Lawrence Livermore National Security, LLC., The Regents of the University
of California, through Lawrence Berkeley National Laboratory, Battelle Memorial Institute, Pacific
Northwest Division through Pacific Northwest National Laboratory, Carnegie Mellon University, West
Expand All @@ -24,7 +24,7 @@ in the Software to reproduce, distribute copies to the public, prepare derivativ
publicly and display publicly, and to permit other to do so.


SimSinter Copyright (c) 2012 - 2023, by the software owners: Oak Ridge Institute for Science and
SimSinter Copyright (c) 2012 - 2024, by the software owners: Oak Ridge Institute for Science and
Education (ORISE), TRIAD National Security, LLC., Lawrence Livermore National Security, LLC., The
Regents of the University of California, through Lawrence Berkeley National Laboratory, Battelle
Memorial Institute, Pacific Northwest Division through Pacific Northwest National Laboratory,
Expand Down
Binary file modified LICENSE.rtf
Binary file not shown.
6 changes: 3 additions & 3 deletions Master/AspenSinterGUI/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("CCSI")]
[assembly: AssemblyProduct("SinterConfigGUI")]
[assembly: AssemblyCopyright("Copyright © CCSI 2023")]
[assembly: AssemblyCopyright("Copyright © CCSI 2024")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand Down Expand Up @@ -51,5 +51,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("3.0.0.0")]
[assembly: AssemblyFileVersion("3.0.0.0")]
[assembly: AssemblyVersion("3.1.0.0")]
[assembly: AssemblyFileVersion("3.1.0.0")]
4 changes: 2 additions & 2 deletions Master/AspenSinterGUI/SplashWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<RichTextBox MouseLeftButtonDown="Grid_close" Background="White" HorizontalAlignment="Stretch" Margin="0,0,0,0" Name="Instructions" VerticalAlignment="Stretch" Grid.Column="1" Grid.ColumnSpan="4" Grid.Row="2" Grid.RowSpan="3" FontSize="12" IsReadOnly="True" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto">
<FlowDocument>
<Paragraph>
SimSinter was produced under the DOE Carbon Capture Simulation Initiative (CCSI), and is copyright (c) 2012 - 2023 by the software owners: Oak Ridge Institute for Science and Education (ORISE), TRIAD National Security, LLC., Lawrence Livermore National Security, LLC., The Regents of the University of California, through Lawrence Berkeley National Laboratory, Battelle Memorial Institute, Pacific Northwest Division through Pacific Northwest National Laboratory, Carnegie Mellon University, West Virginia University, Boston University, the Trustees of Princeton University, The University of Texas at Austin, URS Energy and Construction, Inc., et al.. All rights reserved.
SimSinter was produced under the DOE Carbon Capture Simulation Initiative (CCSI), and is copyright (c) 2012 - 2024 by the software owners: Oak Ridge Institute for Science and Education (ORISE), TRIAD National Security, LLC., Lawrence Livermore National Security, LLC., The Regents of the University of California, through Lawrence Berkeley National Laboratory, Battelle Memorial Institute, Pacific Northwest Division through Pacific Northwest National Laboratory, Carnegie Mellon University, West Virginia University, Boston University, the Trustees of Princeton University, The University of Texas at Austin, URS Energy and Construction, Inc., et al.. All rights reserved.
</Paragraph>

<Table>
Expand All @@ -48,7 +48,7 @@
</TableCell>
<TableCell>
<Paragraph>
3.0.0
3.1.0
</Paragraph>
</TableCell>
</TableRow>
Expand Down
6 changes: 3 additions & 3 deletions Master/CSVConsoleSinter/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("CCSI")]
[assembly: AssemblyProduct("CSVConsoleSinter")]
[assembly: AssemblyCopyright("Copyright © CCSI 2023")]
[assembly: AssemblyCopyright("Copyright © CCSI 2024")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand All @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("3.0.0.0")]
[assembly: AssemblyFileVersion("3.0.0.0")]
[assembly: AssemblyVersion("3.1.0.0")]
[assembly: AssemblyFileVersion("3.1.0.0")]
6 changes: 3 additions & 3 deletions Master/CSVFileRW/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("CCSI")]
[assembly: AssemblyProduct("CSVFileRW")]
[assembly: AssemblyCopyright("Copyright © CCSI 2023")]
[assembly: AssemblyCopyright("Copyright © CCSI 2024")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand All @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("3.0.0.0")]
[assembly: AssemblyFileVersion("3.0.0.0")]
[assembly: AssemblyVersion("3.1.0.0")]
[assembly: AssemblyFileVersion("3.1.0.0")]
6 changes: 3 additions & 3 deletions Master/ConsoleSinter/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("CCSI")]
[assembly: AssemblyProduct("ConsoleSinter")]
[assembly: AssemblyCopyright("Copyright © CCSI 2023")]
[assembly: AssemblyCopyright("Copyright © CCSI 2024")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand All @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("3.0.0.0")]
[assembly: AssemblyFileVersion("3.0.0.0")]
[assembly: AssemblyVersion("3.1.0.0")]
[assembly: AssemblyFileVersion("3.1.0.0")]
4 changes: 2 additions & 2 deletions Master/DataGrid2DLibrary/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("3.0.0.0")]
[assembly: AssemblyFileVersion("3.0.0.0")]
[assembly: AssemblyVersion("3.1.0.0")]
[assembly: AssemblyFileVersion("3.1.0.0")]
6 changes: 3 additions & 3 deletions Master/DefaultBuilder/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("CCSI")]
[assembly: AssemblyProduct("DefaultBuilder")]
[assembly: AssemblyCopyright("Copyright © CCSI 2023")]
[assembly: AssemblyCopyright("Copyright © CCSI 2024")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand All @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("3.0.0.0")]
[assembly: AssemblyFileVersion("3.0.0.0")]
[assembly: AssemblyVersion("3.1.0.0")]
[assembly: AssemblyFileVersion("3.1.0.0")]
Loading

0 comments on commit 2d07cb3

Please sign in to comment.