Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit49bfc7e

Browse files
committed
bump version to 1.3.0
1 parent04ca137 commit49bfc7e

File tree

6 files changed

+8
-9
lines changed

6 files changed

+8
-9
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[![Build Status](https://travis-ci.org/MARIE-js/MARIE.js.svg?branch=master)](https://travis-ci.org/MARIE-js/MARIE.js)[![Gitter chat](https://badges.gitter.im/MARIE-js/gitter.png)](https://gitter.im/MARIE-js/Lobby)[![npm version](https://badge.fury.io/js/npm.svg)](https://badge.fury.io/js/npm)
44
==============
5-
Current version:`1.2.0`
5+
Current version:`1.3.0`
66

77
MARIE.js is an implementation of a simulator for a 'Machine Architecture that is Really Intuitive and Easy'
88
from[The Essentials of Computer Organization and Architecture](https://books.google.com.au/books/about/The_Essentials_of_Computer_Organization.html?id=3kQoAwAAQBAJ&redir_esc=y) (Linda Null, Julia Lobur) in JavaScript.

‎build/about.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090

9191
<main>
9292
<divid="about"class="container">
93-
<h1class="center">MARIE.js<spanclass="version">v1.2.0</span></h1>
93+
<h1class="center">MARIE.js<spanclass="version">v1.3.0</span></h1>
9494
<h2>About MARIE</h2>
9595
<p>MARIE ('Machine Architecture that is Really Intuitive and Easy') is a machine architecture and assembly language from<ahref="https://books.google.com.au/books/about/The_Essentials_of_Computer_Organization.html?id=3kQoAwAAQBAJ&redir_esc=y"target="_blank">The Essentials of Computer Organization and Architecture</a> (Linda Null, Julia Lobur). The publisher provides a set of<ahref="http://computerscience.jbpub.com/ecoa/3e/simulators.aspx">simulators for the machine</a>, written in Java. However, since using simulators can be rather difficult, we have implemented a web-based version, so that students are able to access it readily and easily. Since beginning the project we have added many features such as importing and exporting of Marie Assembly Source files (*.mas) to provide compatibility with the existing simulators.</p>
9696
<br>
@@ -133,7 +133,7 @@ <h2>License</h2>
133133
<h4class="modal-title"> MARIE.js |<iclass="fa fa-hashtag"></i> Current Version</h4>
134134
</div>
135135
<divclass="modal-body">
136-
<p>This version of<strong>MARIE.js</strong> is: v1.2.0</p>
136+
<p>This version of<strong>MARIE.js</strong> is: v1.3.0</p>
137137
</div>
138138
</div>
139139
</div>

‎build/index.html‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
<li><ahref="./?addition"><spanclass="fa fa-plus"></span> Addition</a></li>
6767
<li><ahref="./?multiply"><spanclass="fa fa-times"></span> Multiply</a></li>
6868
<li><ahref="./?quicksort"><spanclass="fa fa-sort"></span> Quicksort</a></li>
69+
<li><ahref="./?unicode"><spanclass="fa fa-font"></span> Unicode</a></li>
6970
</ul>
7071
</li>
7172
<liclass="dropdown">
@@ -216,7 +217,7 @@
216217
<selectid="output-select"class="output-type">
217218
<option>HEX</option>
218219
<option>DEC</option>
219-
<option>UNICODE</option>
220+
<option>UNICODE (UTF-16BE)</option>
220221
<option>BIN</option>
221222
</select>
222223
<hr>
@@ -242,7 +243,7 @@
242243
<selectid="input-list-select"class="output-type">
243244
<option>HEX</option>
244245
<option>DEC</option>
245-
<option>UNICODE</option>
246+
<option>UNICODE (UTF-16BE)</option>
246247
<option>BIN</option>
247248
</select>
248249
</div>
@@ -335,7 +336,7 @@ <h4>Input Value</h4>
335336
<h4class="modal-title">MARIE.js |<iclass="fa fa-hashtag"></i> Current Version</h4>
336337
</div>
337338
<divclass="modal-body">
338-
<p>This version of<strong>MARIE.js</strong> is: v1.2.0</p>
339+
<p>This version of<strong>MARIE.js</strong> is: v1.3.0</p>
339340
</div>
340341
</div>
341342
</div>

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name":"MARIE.js",
3-
"version":"1.2.0",
3+
"version":"1.3.0",
44
"description":"MARIE.js is an implementation of a simulator for a 'Machine Architecture that is Really Intuitive and Easy' from The Essentials of Computer Organization and Architecture (Linda Null, Julia Lobur) in JavaScript.",
55
"main":"main.js",
66
"scripts": {

‎src/css/styleDark.css‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@ button[disabled=disabled], button:disabled {
127127
}
128128

129129
.output-type {
130-
width:100px;
131130
text-align: right;
132131
color: inherit;
133132
bottom:100%;

‎src/css/styleLight.css‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,6 @@ codeblock {
500500
}
501501

502502
.output-type {
503-
width:100px;
504503
text-align: right;
505504
background-color: inherit;
506505
color: inherit;

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp