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

1812 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
5683d61435 Fixed derp in gpu.set introduced with wide char checks (aka 'index out of bounds of doom'). 2014-07-21 20:36:14 +02:00
Florian Nücke
3916a6a6ae Fixed / adjusted behavior of unicode.wlen to not derp things (i.e. don't use -1 length for control chars like \n). 
Some formatting and tweaks in ls.lua.
 2014-07-21 18:50:31 +02:00
Florian Nücke
a3c7653558 Adjusted backport of Mekanism support for 1.6. 2014-07-21 18:37:05 +02:00
Florian Nücke
d362b5015c Added Mekanism to power converter tooltip and power mod availability check. 
Minor refactoring of variable names.

Conflicts:
	src/main/scala/li/cil/oc/common/tileentity/traits/power/UniversalElectricity.scala
 2014-07-21 18:19:06 +02:00
Florian Nücke
c5cd53b76a Added Mekanism API and supporting its power system directly. 
Conflicts:
	src/main/scala/li/cil/oc/Settings.scala
	src/main/scala/li/cil/oc/util/mods/Mods.scala
 2014-07-21 18:17:39 +02:00
Florian Nücke
718b81cbd6 Fixed term.write for strings with tabs (snuck in with wide char stuff). 2014-07-21 17:53:17 +02:00
Florian Nücke
e4592dfec9 Merge branch 'patch-9' of https://github.com/istasi/OpenComputers 2014-07-21 17:31:43 +02:00
Florian Nücke
32b9044eb4 Tracking uptime manually (not via delta to timestarted based on world time). Closes #419. 2014-07-21 17:10:17 +02:00
Florian Nücke
0821aaba86 Fixed the tablet test item and enabled for now to allow people testing it (can't be crafted though, it's for testing only). 2014-07-21 16:42:03 +02:00
Florian Nücke
2f46c07ed5 Using MC resource provider to get Unifont to allow changing it in resource packs (and code for re-generating char lookup texture accordingly). 2014-07-21 14:36:50 +02:00
Florian Nücke
48516beebd Fixed a typo in irc.lua and tracking own nickname (on nick changes) and displaying own name instead of 'me' and 'You' for messages/actions. 2014-07-21 13:28:51 +02:00
Florian Nücke
5e38060da5 Merge branch 'master' of https://github.com/PixelToast/OpenComputers 2014-07-21 13:04:31 +02:00
Florian Nücke
9e758608da Organize imports. 2014-07-21 12:35:55 +02:00
PixelToast
88754eafe7 Update irc.lua 2014-07-20 21:00:02 -04:00
Florian Nücke
633ca1cee1 Finally took the time to make cables use the ISBRH instead of a TESR. 2014-07-21 02:02:12 +02:00
Florian Nücke
52918b5bcc Fixed scaling of text in robot screens when using custom (lower) resolutions. 2014-07-20 21:35:38 +02:00
Florian Nücke
0c6d509227 Made robots have the same res as t1 screens since that fits into the GUI, now. Fewer special cases \o/ 2014-07-20 21:28:06 +02:00
Florian Nücke
cb0e51efbb Properly erroring for invalid indexes in gpu.get now and (probably?) fixing a bug in term.isWide. 2014-07-20 19:02:33 +02:00
istasi
4f874712c5 Update ls.lua 
Changed so newlines only are inserted if io.output() == io.stdout and component.gpu isn't nil, or enough files to reach math.huge

it still formats width between file entries based on max length though, regardless of whenever there's an gpu or not though...

Though in which case would ls ever be used where there's no gpu?, and in said case, why not just use filesystem.list directly?
 2014-07-20 18:30:06 +02:00
Florian Nücke
ef9506fd82 Meh. 2014-07-20 17:34:45 +02:00
Florian Nücke
78957853ef Adjusted robot GUI for new font renderer's char aspect ratio (auto-sizes now). 
Extracted the commonly used progress bar code into a common class.
 2014-07-20 17:22:25 +02:00
Florian Nücke
114b232e9a Fixed texture names. 2014-07-19 22:44:20 +02:00
Florian Nücke
9009c73398 Fixes that don't fix anything. 2014-07-19 22:35:57 +02:00
Florian Nücke
72e47bc7c2 Mod ids as constants instead of strings all over the place. 2014-07-19 17:42:14 +02:00
Florian Nücke
672d9d6b83 Merge branch 'master' of github.com:MightyPirates/OpenComputers 2014-07-19 13:58:29 +02:00
Florian Nücke
14d79b9456 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers 
Conflicts:
	src/main/scala/li/cil/oc/common/block/AccessPoint.scala
	src/main/scala/li/cil/oc/common/block/Hologram.scala
	src/main/scala/li/cil/oc/common/block/Redstone.scala
	src/main/scala/li/cil/oc/common/block/Screen.scala
	src/main/scala/li/cil/oc/common/block/ServerRack.scala
	src/main/scala/li/cil/oc/common/block/Switch.scala
	src/main/scala/li/cil/oc/common/recipe/ExtendedRecipe.scala
	src/main/scala/li/cil/oc/common/tileentity/AccessPoint.scala
	src/main/scala/li/cil/oc/common/tileentity/ServerRack.scala
	src/main/scala/li/cil/oc/common/tileentity/Switch.scala
 2014-07-19 13:58:08 +02:00
Florian Nücke
da8b6c55aa Compiler fun! 2014-07-19 13:47:30 +02:00
Florian Nücke
9d49a98db7 Some cleanup. 2014-07-19 13:37:02 +02:00
Florian Nücke
5f19433ba8 Centralizing use of sided checks to make it easier to swap out for testing in the future, and added some hackiness to maybe make it more stable. 2014-07-19 13:29:45 +02:00
Florian Nücke
fe4444dacc Revert "Trying to get rid of FMLCommonHandler.instance.getEffectiveSide where possible, since it can apparently fail in some scenarios." 
This reverts commit b3813bc4f563a4066fd79db1dad16db3673bb324.

And a few more related commits. Turns out this was caused by some Bukkit plugin, tho it is still unknown which one exactly.

Conflicts:
	src/main/scala/li/cil/oc/common/EventHandler.scala
	src/main/scala/li/cil/oc/common/component/TextBuffer.scala
 2014-07-19 13:17:33 +02:00
Florian Nücke
b56f6576fb Merge pull request #418 from Vexatos/patch-9 
Update oppm.lua
 2014-07-19 12:37:42 +02:00
Vexatos
86c580ad58 Update oppm.lua 2014-07-19 11:26:44 +02:00
istasi
435fccd9eb Update ls.lua 2014-07-18 15:20:23 +02:00
istasi
f269d19245 Update ls.lua 2014-07-18 14:48:50 +02:00
Florian Nücke
23be2a7ebd Cleaned up components.lua a little and allowing to specify multiple filters (each argument is used as filter) and only printing methods for -l. 2014-07-18 13:06:41 +02:00
istasi
bad2f94ca0 Update components.lua 2014-07-17 23:43:39 +02:00
Florian Nücke
1004c9572b Fixed a potential issue when new characters were loaded into the font lookup-texture and the char is a wide char that doesn't fit into the last row of the texture. 
It would have been rendered 'outside' the texture, leading to the char being incorrectly displayed. Now checking for this case, too, and creating new texture instead.
 2014-07-17 18:06:41 +02:00
Florian Nücke
3dd3eed915 Removed more stuff from new font renderer that's no longer needed. 2014-07-17 18:00:29 +02:00
Florian Nücke
35116c26cb Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers 2014-07-17 17:52:41 +02:00
Florian Nücke
15125cc4b6 More mysterious NPEs! 2014-07-17 17:51:34 +02:00
Florian Nücke
ca5b3805ba Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers 2014-07-17 17:09:16 +02:00
Florian Nücke
81bdce12be Fix potential NPE. 2014-07-17 17:07:53 +02:00
Florian Nücke
e8eb3a4453 Updated for the side check change. 2014-07-17 17:03:13 +02:00
Florian Nücke
ef0034742c Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers 2014-07-17 17:02:57 +02:00
Florian Nücke
78c6d01051 Fix for version injection into config after file name change. 2014-07-17 17:01:27 +02:00
Florian Nücke
e054012e1b Merge branch 'OC1.3-MC1.6.4' of C:\Users\fnuecke\Workspace\OpenComputers-1.3-MC1.6.4 
Conflicts:
	src/main/scala/li/cil/oc/common/block/AccessPoint.scala
	src/main/scala/li/cil/oc/common/block/Hologram.scala
	src/main/scala/li/cil/oc/common/block/Redstone.scala
	src/main/scala/li/cil/oc/common/block/ServerRack.scala
	src/main/scala/li/cil/oc/common/block/Switch.scala
	src/main/scala/li/cil/oc/common/tileentity/AccessPoint.scala
	src/main/scala/li/cil/oc/common/tileentity/ServerRack.scala
	src/main/scala/li/cil/oc/common/tileentity/Switch.scala
 2014-07-17 16:30:09 +02:00
Florian Nücke
738bcb5954 Merge branch 'OC1.3-MC1.6.4' of C:\Users\fnuecke\Workspace\OpenComputers-dev-MC1.6.4 into OC1.3-MC1.6.4 
Conflicts:
	src/main/scala/li/cil/oc/common/EventHandler.scala
	src/main/scala/li/cil/oc/common/component/TextBuffer.scala
 2014-07-17 16:22:06 +02:00
Florian Nücke
20443f54e9 Fixes for the adjusted side checks. 2014-07-17 16:16:31 +02:00
Florian Nücke
93218f4ff7 The Optional.Method annotation seems to not work in dev-env in some cases... trying to work around that to fix absence of FMP and Waila related crashes in dev-env. 2014-07-17 16:02:36 +02:00
Florian Nücke
b3813bc4f5 Trying to get rid of FMLCommonHandler.instance.getEffectiveSide where possible, since it can apparently fail in some scenarios. 2014-07-17 15:15:26 +02:00