AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-16 18:55:03 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,594 Commits 29 Branches 143 Tags
Commit Graph

1594 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
c05d921529 Merge pull request #361 from JoshTheEnder/patch-1 
Update greetings.txt
 2014-06-26 14:28:53 +02:00
Josh
12b46336fb Update greetings.txt 2014-06-26 13:27:25 +01:00
Florian Nücke
45a9728b6d Made text.wrap not wrap at a couple more chars. 
Added text.wrappedLines to get an iterator over wrapped text.
Made OpenOS show a small info text after booting up.
 2014-06-26 14:21:39 +02:00
Florian Nücke
c96174d168 Yay random dependency resolving >_> 2014-06-26 13:36:35 +02:00
Florian Nücke
e3d3e3c7f9 Apparently gradle hates me. 2014-06-25 22:10:34 +02:00
Florian Nücke
40dc7c5df0 Added T2 redstone card. Closes #340. 
T1 is now vanilla functionality (simple, analog redstone signals), T2 is for mod interop (bundled redstone, wireless redstone). Existing redstone cards are automatically converted to T2 cards, to avoid breaking things more than necessary. Redstone blocks behave like T2 cards, but without the wireless support.
 2014-06-25 21:14:06 +02:00
Florian Nücke
fd8ecbc391 Merge branch 'tablet' 2014-06-25 13:56:40 +02:00
Florian Nücke
ac8b490229 Brought back the workaround for IC2 not giving a damn about the returned value from energy injection (and therefore energy getting lost). Closes #348. 2014-06-25 13:35:35 +02:00
Florian Nücke
1d4842ebc2 Fixes #359. 2014-06-25 13:22:17 +02:00
Florian Nücke
6f755c6b68 Should fix #350. 
Bump version to RC1.
 2014-06-24 17:35:54 +02:00
Florian Nücke
9531819ee1 Avoid NPE when a computer's readFromNBT is called on client side by other mods. 2014-06-23 23:33:20 +02:00
Florian Nücke
7e5564783b Made io.open resolve paths relative to the current working directory. Closes #354. 2014-06-23 23:08:37 +02:00
Florian Nücke
f8026c9310 Some fixes and a texture for the tablet prototype. 2014-06-22 23:07:44 +02:00
Florian Nücke
b8cb9b672b Merge branch 'master' of github.com:MightyPirates/OpenComputers into tablet 
Conflicts:
	src/main/scala/li/cil/oc/Items.scala
	src/main/scala/li/cil/oc/client/GuiHandler.scala
 2014-06-22 20:43:28 +02:00
Florian Nücke
4532186439 Made shift-click logic in container GUIs less derpy when involving 'damageable' items (e.g. batteries). 2014-06-22 20:40:31 +02:00
Florian Nücke
d3560d17b6 Fixed fs.path returning double slash for elements in root. 2014-06-22 19:13:19 +02:00
Florian Nücke
3ef3413586 Fixed wget not closing and deleting files when erroring while downloading. 
Made wget more friendly when used by other programs, added -Q option (superquit, no output whatsoever).
 2014-06-22 16:39:33 +02:00
Florian Nücke
00c067f642 Fixed something that doesn't fix anything. 2014-06-22 15:19:04 +02:00
Florian Nücke
e7e04d91aa Added getter to hologram to determine color support (tier). 
Adjusted palette color getter/setter in hologram to use same indexes as when setting (i.e. starting at 1, with 0 being reserved for blank).
 2014-06-22 01:21:34 +02:00
Florian Nücke
1cd65bd2b3 Fixed screen GUI size not being properly updated when Minecraft windows was resized. 2014-06-21 21:49:11 +02:00
Florian Nücke
b91c8e839d Left-aligned bluescreen messages and replacing tabs with two spaces to avoid the question marks. 2014-06-21 21:16:59 +02:00
Florian Nücke
7cd99e8e79 Moved the _OSVERSION global to OpenOs's init script, where it should be now. 2014-06-21 19:55:15 +02:00
Florian Nücke
fed7007259 Allow getting robot name via robot.player().getDisplayName(). 2014-06-21 16:42:13 +02:00
Florian Nücke
b236b01dd0 Moved some stuff into centralized event handler to sync that up with 1.7 better. 2014-06-21 16:41:04 +02:00
Florian Nücke
55c5a25613 Fixed coordinates being computed incorrectly in some quadrants (I should really read my own javadoc...). Fixes #344. 2014-06-21 01:27:03 +02:00
Florian Nücke
ffb2ab7e01 Showing proper 'CPU is missing' message when turning on computers without CPU that have no components attached. 2014-06-20 23:11:46 +02:00
Florian Nücke
bc8c29812f Fixed primaries being determined using the fuzzy component.list getter by adding a second parameter to list, exact, which will suppress fuzzy search. 
This prevents the inventory controller upgrade to be returned for `component.inventory`, for example, and will only return it for `component.inventory_controller` now, as was originally intended.
 2014-06-20 22:10:43 +02:00
Florian Nücke
64bf4d67e4 Super-secret feature. 2014-06-20 22:06:00 +02:00
Florian Nücke
79c202fe21 Refactored localization stuff into a single class. Decided I didn't like those duplicate strings flying around all over the place. 2014-06-20 12:52:26 +02:00
Florian Nücke
56f46cb923 Fixes #341 (again). 2014-06-19 21:51:04 +02:00
Florian Nücke
9cd30460a1 Should fix #341. 2014-06-19 20:22:29 +02:00
Florian Nücke
049129040d Scalaified disk-insert-on-rightlick a little, made the sneak logic feel more... natural (in the context of MC that is, at least in my opinion). 
Made floppies pass sneak clicks through to disk drives to ensure consistent sneak logic.
 2014-06-19 16:02:31 +02:00
Florian Nücke
df4b1feddb Merge git://github.com/Kilobyte22/OpenComputers 2014-06-19 15:19:20 +02:00
Florian Nücke
66e7f25611 Organize import for the lulz. 2014-06-19 15:19:13 +02:00
Kilobyte22
744cd991a2 Made Disk Drives react to right clicks. 
Disk drives now react to right clicks in the following ways:
regular right click, holding a disk: insert disk. If there is already a disk inside it is ejected first
regular right click, otherwise: open GUI
shift right click: eject disk

Furthermore, added myself to robot list
 2014-06-19 10:52:07 +02:00
Florian Nücke
67321e73fe Actually using the TMPDIR env var where relevant. 2014-06-18 14:02:56 +02:00
Florian Nücke
5c17e003ef Merge git://github.com/Wuerfel21/OpenComputers 2014-06-18 13:49:59 +02:00
Florian Nücke
580386acaa Fixed hardmode recipes for hard drives tier 2 and 3. 2014-06-18 13:16:32 +02:00
Florian Nücke
cfd8b5db16 Reworked font rendering system to be a little more generic. 
Added font renderer i've been tinkering with that generates character textures on the fly from an actual font, in the hopes of supporting arbitrary unicode one day. It's terribly broken, still, though.
 2014-06-18 13:10:30 +02:00
Wuerfel_21
aca9894e76 fixed random stuff 
well, title states.
and there is some random binary for you:
11000011 01011101
10101110 11001111
00100011 00110110
01011000 01110101
11101111 11010100
11100101 10010011
00011001 11100101
10000101 10100000
11011001 01110110 10000111 00111000 00010000 10011001 10100111 10111100
10000101 00010000 01010010 10111101 10011101 00010101 10010001 00001101
10110100 10101111
00110001 11010101
01011010 11000000
00000100 10101011
01011111 11001111
 2014-06-17 15:20:23 +02:00
Wuerfel_21
8ca7306f34 Made Histrory Length a EnvVar 
Well, there is it!
 2014-06-17 09:46:41 +02:00
Wuerfel_21
fe08db56cc Made history longer 
It was too short, i always needed to retype long commands
 2014-06-16 23:12:37 +02:00
Florian Nücke
cbfe1dd25a Moved besh-specific documentation to extra manpage for bash, removed it from the simple shell's manpage. Closes #333. v1.3.0-beta.1 2014-06-16 22:10:00 +02:00
Florian Nücke
7d62262984 Fixed pseudo-racing condition in package relay of switches and co. that could increase the time it took to resend a packet. Closes #327. 2014-06-16 21:51:25 +02:00
Florian Nücke
8f1cac9f9a Fixed variable expansion in shell. 2014-06-16 17:17:17 +02:00
Florian Nücke
82d1a8a955 Merge pull request #330 from Vexatos/patch-6 
Added OPPM loot disk.
 2014-06-16 17:01:13 +02:00
Vexatos
eaafbcaf9d Create oppm.cfg 2014-06-16 16:54:05 +02:00
Vexatos
ce982b15b5 Create autorun.lua 2014-06-16 16:51:37 +02:00
Vexatos
8a7b11b169 Create oppm.lua 2014-06-16 16:49:23 +02:00
Vexatos
e1add13ca1 Update loot.properties 2014-06-16 16:48:43 +02:00