Merge maintenance/mps20251 into master #1501
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…eded for variability (#1495).
…language_1495 Some extensions for the o.i.req.core language
Bugfix DecTab not respecting the default value
Merge maintenance/mps20241 into maintenance/mps20251
…concatenation add split intention for StringLiteral
# Conflicts: # CHANGELOG.md # build/scripts/build-allScripts.xml # code/languages/org.iets3.opensource/languages/org.iets3.core.expr.data/org.iets3.core.expr.data.mpl # code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/org.iets3.core.expr.util.mpl # code/languages/org.iets3.opensource/tests/test.ts.expr.os/test.ts.expr.os.msd
Merge maintenance/mps20232 into maintenance/mps20241
Merge maintenance/mps20241 into maintenance/mps20251
No background color was set and they had the color of the parent node. Fixes #1392
Explicitly specifying the type of the takari-cpsuite dependency makes it unnecessary to override its jar name.
…s_in_generator fix NumberLiteral editor breaking in generator
Merge maintenance/mps20241 into maintenance/mps20251
…521-Open- Bugfix/confusing solver warning#1521 open
Member
Master is fixed now. We are building with 253 aka 2026.1. |
Merge maintenance/mps20241 into maintenance/mps20251
Member
|
I don't think this PR will work out automatically. Manually create a fresh PR from 2025.1 -> master needs to be done. @mhuster23 might you have the time to give it a try? |
….opensource.git into bugfix/colon-cast
#688 Avoid colon casts in type system
Merge maintenance/mps20241 into maintenance/mps20251
# Conflicts: # build.gradle # code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/models/org.iets3.variability.featuremodel.base.behavior.mps # code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/models/org.iets3.variability.featuremodel.base.structure.mps
This reverts commit d409f4d
Member
|
HOLY MOLY! 🥳 It's green! Thx @mhuster23 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
9 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merge changes from
maintenance/mps20251tomaster.