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
3,543 Commits 29 Branches 143 Tags
Commit Graph

3543 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
c05ff8fb81 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers 2014-08-17 00:54:09 +02:00
Florian Nücke
5eb4a1e76e Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 2014-08-17 00:53:50 +02:00
Florian Nücke
04114e68b8 Made screen T2 and raw circuit board recipes use oredict dyes, closes #493. 2014-08-17 00:53:28 +02:00
Florian "Sangar" Nücke
a46f71c72c Merge pull request #497 from gamax92/gpu_fix 
Make init.lua do exact component matching
 2014-08-17 00:39:56 +02:00
Florian Nücke
4508e4f45e Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers 
Conflicts:
	build.properties
 2014-08-16 23:52:24 +02:00
Florian Nücke
c1299a6f1d Merge branch 'OC1.3-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-08-16 23:51:06 +02:00
Florian Nücke
52d2d10e3b Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 2014-08-16 23:50:13 +02:00
Florian Nücke
f169cae801 Fixes a potential NPE in adapter if block driver returns null environment. 2014-08-16 23:49:55 +02:00
Florian Nücke
a621d69018 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 
Conflicts:
	src/main/scala/li/cil/oc/common/EventHandler.scala
	src/main/scala/li/cil/oc/server/component/Keyboard.scala
 2014-08-16 23:42:09 +02:00
Florian Nücke
e0a7e75027 Fixed a memory leak on world unload, should close #498. 2014-08-16 23:38:37 +02:00
James Coon
cd6011ab20 Make init.lua do exact component matching 
Fixes init.lua randomly picking a different component that may happen to share "gpu" in the name.
 2014-08-16 12:56:52 -06:00
Florian Nücke
1fb79f16ab Merge branch 'OC1.3-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	build.properties
 2014-08-16 13:37:30 +02:00
Florian Nücke
62e7dff05b Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	build.properties
 2014-08-16 13:36:37 +02:00
Florian Nücke
0c43456e5f Also updating Adapter via onNeighborTileChange, closes #496 (hopefully). 2014-08-16 13:33:09 +02:00
Florian Nücke
bd258a9dd4 Adjustments for release. 2014-08-16 13:13:39 +02:00
Łukasz Magiera
d422d89cf4 Add OpenLoader Loot disk 2014-08-16 01:46:48 +02:00
Florian Nücke
de8aee3505 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 
Conflicts:
	build.properties
 2014-08-15 17:20:20 +02:00
Florian Nücke
5992284458 Adjustments for release. 2014-08-15 17:18:06 +02:00
Florian Nücke
b664f07c52 Adjustments for release. 2014-08-15 17:01:08 +02:00
Florian Nücke
f4ca0367b3 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-08-15 15:10:16 +02:00
Florian Nücke
ebd477aa21 Added setting to allow changing the color of monochrome (one-bit color depth) text (tier one screen / GPU), closes #459. v1.3.3 2014-08-15 13:27:44 +02:00
Florian Nücke
e22b85342d Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-08-15 01:36:33 +02:00
Florian Nücke
12082391bb Made hologram max scale setting use doubles instead of ints for more flexibility and reworded the comment in the config a little. 2014-08-15 01:29:23 +02:00
Florian Nücke
5ba5b3cea8 Merge https://github.com/xedp3x/OpenComputers 2014-08-15 01:21:19 +02:00
Florian Nücke
093db6798b Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-08-15 01:05:05 +02:00
Florian Nücke
3a9f6b0311 Made filesystem.isLink return the destination of the link as a second value, if it is one. 2014-08-15 01:04:38 +02:00
Florian Nücke
9327762d95 Autoconverting Iterables, e.g. for cases like return new Object[]{hashMap.values()} (hope this doesn't break anything). 
Added special key for converters, `oc:flatten`. If there is only key in the converted table and it has that name, the value of that key will be used directly.
 2014-08-15 01:00:35 +02:00
Florian Nücke
c02cbdea8e Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	src/main/scala/li/cil/oc/server/component/DebugCard.scala
 2014-08-14 15:58:23 +02:00
Florian Nücke
7b390601f7 Slightly reworked hologram.fill(), now may take an additional param, the lower end of the interval to fill, and won't "autoclear" (will now only overwrite in that interval), which *may* break some programs. I'm so sorry. A little. 2014-08-14 15:55:26 +02:00
Florian Nücke
06a93744a5 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-08-14 14:37:39 +02:00
Florian "Sangar" Nücke
52252ec49a Merge pull request #487 from Vexatos/patch-10 
Yet another OPPM update
 2014-08-14 14:36:30 +02:00
Vexatos
39c7ab5522 Yet another OPPM update 
Hopefully this fixes dependency installation problems. I need some testers!
 2014-08-14 14:33:04 +02:00
XEdP3X
986ed58c58 transfer hologramMaxScaleByTier to the config file 2014-08-14 11:17:03 +02:00
XEdP3X
1df0804608 transfer hologramMaxScaleByTier to the config file 2014-08-13 18:34:38 +02:00
Florian Nücke
e15f411fbe Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-08-13 16:51:20 +02:00
Florian Nücke
ea88404d90 Fixed servers being able to boot if a component bus was present but no CPU. 2014-08-13 16:50:40 +02:00
Florian Nücke
30bdf3577b Marking the slot enum related methods in the API as deprecated instead, less spam when building for people using the API. 2014-08-13 16:44:50 +02:00
Florian Nücke
4c1308b592 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	src/main/scala/li/cil/oc/server/component/machine/NativeLuaArchitecture.scala
 2014-08-12 18:40:03 +02:00
Florian Nücke
2c87f6059a Disabling Lua GC while persisting and unpersisting, might help with native crash. 2014-08-12 18:36:18 +02:00
Florian Nücke
53926fba02 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	src/main/scala/li/cil/oc/server/component/machine/NativeLuaArchitecture.scala
 2014-08-12 16:38:10 +02:00
Florian Nücke
891efc924e Still can't remember why top-level coroutine.yield() in programs wouldn't pull events... nothing seems to break, so there. Closes #483. 
Also made sh add traceback to message when program crashes.
 2014-08-12 16:23:46 +02:00
Florian Nücke
034f28ca05 Added a debug card item, allows manipulating the world some to make it easier to test stuff. 2014-08-12 15:52:14 +02:00
Florian Nücke
4d8baa7efa Fixed computers failing to save when saved while performing a synchronized call on userdata. 2014-08-12 15:16:59 +02:00
Florian Nücke
0c8aa8351d Adjustments for 1.7. 2014-08-12 02:54:27 +02:00
Florian Nücke
7508fa4824 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-08-12 02:51:59 +02:00
Florian Nücke
466dc21592 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	src/main/scala/li/cil/oc/client/gui/Icons.scala
	src/main/scala/li/cil/oc/common/Proxy.scala
	src/main/scala/li/cil/oc/common/event/TinkersConstructToolHandler.scala
	src/main/scala/li/cil/oc/common/tileentity/Case.scala
	src/main/scala/li/cil/oc/common/tileentity/RobotAssembler.scala
 2014-08-12 02:51:46 +02:00
Florian Nücke
a2e2a9b72e Fixed index out of bounds in term.isWide, closes #484. 2014-08-12 02:51:17 +02:00
Florian Nücke
df9438db8e Made creative tier case only changeable when in creative mode, closes #476. 
Made robots respect inventory.isUsableByPlayer.
 2014-08-12 02:16:54 +02:00
Florian Nücke
de2e419ac7 Implemented component bus item, which replaces the additional CPUs in servers (in existing servers, multiple CPUs will remain functional for now, they just can't be inserted any more, only component buses can). This is in preparation for #393, to allow make a computer's architecture be controlled via the CPU installed in it. 2014-08-11 23:18:55 +02:00
Florian Nücke
6f08f5cafd Changed how slot types are referred to internally in preparation of the Slot enum being removed in 1.4. 2014-08-11 22:16:50 +02:00