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

1659 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
2b801f2b4a Fixed damage handling for TC tools. 2014-06-26 18:00:12 +02:00
Florian Nücke
6694455c14 Removed the config for the 'greeting' again, instead wrapped the functionality in a motd file that can be a script. Delete it to disable the greeting. 2014-06-26 17:41:26 +02:00
Florian Nücke
8683f500c9 Made Lua accept an argument, the path to a script to execute, and an option, -i, to enter interactive mode after executing that script, anyway. 
Made process.load check for #!, running command instead of as Lua script directly. Let's see if things go horribly wrong, now.
 2014-06-26 17:35:23 +02:00
Florian Nücke
65b3bc836a Fixed output of component.experience.level(). 2014-06-26 16:38:44 +02:00
Florian Nücke
858572183f Fixed ranges in experience upgrade event handler leading to no experience gain. 2014-06-26 16:33:02 +02:00
Florian Nücke
3fd4a42a32 Fixed robot item repair events passing the stacks in the wrong order, leading to items not being used up at the decreased rate they should be. 2014-06-26 16:21:29 +02:00
Florian Nücke
00e4f55026 Minor cleanup to more.lua, fixed single line advance to not exit when at end of file. 2014-06-26 15:05:19 +02:00
Florian Nücke
4f0665f2b6 Merge git://github.com/jamesb6626/OpenComputers 2014-06-26 14:52:09 +02:00
Florian Nücke
ef88008dd3 Added openos.conf, for now only with an option to disable the greetings. 2014-06-26 14:45:38 +02:00
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
jamesb6626
4c8b33e5d9 Fix problem pointed out by fnuecke 
Changed 1 and 0 to true and false
 2014-06-25 16:48:15 +01: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
jamesb6626
41579f85bc Merge remote-tracking branch 'upstream/master' 2014-06-24 16:52:25 +01:00
Florian Nücke
6f755c6b68 Should fix #350. 
Bump version to RC1.
 2014-06-24 17:35:54 +02:00
jamesb6626
6164d6f0c0 Add more controls for more.lua command + tidy up 
Added more keys for the command to recognise ("page down" goes to the next page in the same way as "space", "enter" and "down" print just the next line)
Moved the code to print lines from the file to a function to reduce the space used by repeating it for the new keys
 2014-06-24 14:24:10 +01: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
Wuerfel_21
d553f4e065 Fixed typo 
derp
 2014-06-21 12:06:20 +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
Wuerfel_21
1f1a97e007 This is for linux purists 
...
 2014-06-20 10:15:52 +02:00
Wuerfel_21
084aa8ab43 Made ls display amount of dirs/files 
Self explanatory
 2014-06-19 23:59:17 +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