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

3139 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Soni L.
ff2d0342e1 Add readNumber()/file:read("*n") 2014-12-23 11:41:41 -02:00
Florian Nücke
766eb0ac6d Fixed debug.runCommand in pure single player mode, fixes #754. 2014-12-23 13:16:03 +01:00
Florian Nücke
f499f939a8 Added configuration option to access points' component to set whether they should act as repeaters or not, closes #718. 2014-12-23 03:46:26 +01:00
Florian Nücke
00b216552c Added assembler template filter system, closes #753. 
Allows registering new filters via IMC. Providing default filter using new setting `misc.assemblerBlacklist` which is a list of item id + optional damage descriptors of the format 'itemid@damage', e.g. 'OpenComputers:case3' or 'minecraft:stonebrick@1'.
 2014-12-22 23:48:46 +01:00
Florian Nücke
c978290f44 Added debug.insertItem to spawn item stacks into inventories in the world, closes #752. 2014-12-22 22:06:52 +01:00
Florian Nücke
f5193e9a4e Dem interface changes. 2014-12-22 17:01:39 +01:00
Florian Nücke
f147481900 Better Waila support for servers. 2014-12-22 16:57:53 +01:00
Florian Nücke
7885a3f5b3 Started updating to new Waila API (1.56). So much cleaner \o/ 2014-12-22 15:06:09 +01:00
Florian Nücke
64afd8d98e Require IC2 proper to be present instead of just the API, should fix #747. 2014-12-20 21:03:49 +01:00
Florian Nücke
3dd7075518 Don't even try to render the holograms on very low-end cards that don't support OpenGL 1.5 to avoid crashes. 2014-12-19 19:28:49 +01:00
Florian Nücke
c6d5584f93 Recompiled native lib on Win7, let's see if this helps on some systems... 2014-12-19 18:11:52 +01:00
Florian Nücke
4eceafaaa5 Adding git ref to version when building locally. 2014-12-19 18:11:25 +01:00
Florian Nücke
e66c7dc742 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-12-16 18:42:54 +01:00
Florian Nücke
27e74e2b63 Added setting for EEPROM size. Closes #742. 2014-12-16 18:41:29 +01:00
Florian Nücke
ea6cc631ef Using NamedBlock interface for ordering environments when merging them for blocks, should close #745. 
Also reworked callback analysis in general, should behave better in general, now (e.g. mixing ManagedPeripheral with Environment should work, now).
May also have broken everything ever, so re-testing with stuff that uses those interfaces (`NamedBlock`, `ManagedPeripheral`) is required.
 2014-12-16 18:37:20 +01:00
Florian "Sangar" Nücke
3084e68ba7 Merge pull request #744 from magik6k/master 
Added OpenLoader EEPROM flasher
 2014-12-16 16:17:00 +01:00
Łukasz Magiera
818bc1c3a9 Added OpenLoader EEPROM flasher 2014-12-16 14:27:18 +01:00
Florian "Sangar" Nücke
06f496b45a Merge pull request #734 from Mazdallier/patch-3 
Update fr_FR.lang
 2014-12-14 18:17:32 +01:00
Florian Nücke
0271a98830 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-12-14 14:24:20 +01:00
Florian Nücke
860c609da2 Preprocessing clipboard data in edit.lua a bit, converting \r\n to \n and converting tabs to spaces. Closes #724. 2014-12-14 14:22:26 +01:00
Florian Nücke
31f79dbc76 Removed hacky AE2 P2P tunnel as a proper one will likely be added to AE2 itself. 2014-12-14 14:09:37 +01:00
Florian Nücke
ab9bac51fa Raid file systems can now be labeled. 2014-12-14 13:56:26 +01:00
Florian "Sangar" Nücke
b1bc3506af Merge pull request #740 from Vexatos/patch-16 
Added incredibly important text to oppm.lua
 2014-12-14 13:25:58 +01:00
Vexatos
af13d5dc8b Added incredibly important text to oppm.lua 2014-12-14 13:23:05 +01:00
Yves
63e289caad Update fr_FR.lang 2014-12-12 11:23:42 +01:00
Florian Nücke
3ca6bc28f6 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-12-11 18:28:54 +01:00
Florian "Sangar" Nücke
832276f2fa Merge pull request #732 from Mazdallier/patch-3 
Update fr_FR.lang
 2014-12-11 18:27:11 +01:00
Florian Nücke
3868d582ed Fixed potential term derps on very quick reconnections of screens (e.g. breaking a cable and replacing it really quickly). 2014-12-11 17:44:36 +01:00
Yves
1aac28bdf4 Update fr_FR.lang 2014-12-11 17:13:38 +01:00
Florian Nücke
b288a63e18 Fixed tablets not being properly un/reloaded on dimension changes, closes #727. 2014-12-11 14:21:35 +01:00
Florian Nücke
58ab97142a Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-12-11 13:33:59 +01:00
Florian "Sangar" Nücke
fa8f803b79 Merge pull request #726 from Mazdallier/patch-3 
Update fr_FR.lang
 2014-12-11 01:49:08 +01:00
Yves
2293cce173 Update fr_FR.lang 
Blocks and items only
 2014-12-10 17:08:56 +01:00
Florian Nücke
2eef0fe17c Updated remark on robot names. 2014-12-10 15:52:38 +01:00
Florian Nücke
8a9ae4b53e Made getDrops implementation more specific as discussed as it could cause issues otherwise as discussed here http://git.io/IcNAyg 2014-12-10 15:32:06 +01:00
Florian Nücke
6f788e0b14 Added driver for analyzer block from Forestry for #723. 
Slightly improved bee house driver (avoid duplicates in returned tables).
 2014-12-10 15:20:15 +01:00
Florian Nücke
060990e977 Fixed conversion of nested tables containing exact duplicate entries (memoization was a bit broken). 2014-12-10 15:13:59 +01:00
Florian Nücke
8747dfc609 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-12-10 01:41:17 +01:00
Florian Nücke
94a14ed8db Fixed robots vanishing when broken by AE2 annihilation planes. Closes #722. 
Fixed potential NPE in robot use logic (if robot.use() resulted in a new stack appearing in the robot's tool slot).
Added extra check to robots' setInventorySlotContents, drop into world if slot is invalid for item.
 2014-12-10 01:40:57 +01:00
Florian Nücke
441e11d5b2 Updated Project Red dependency because old maven is apparently not used anymore. 2014-12-10 01:17:03 +01:00
Florian "Sangar" Nücke
f60b07de88 Merge pull request #721 from magik6k/master 
Add new tools to Network floppy
 2014-12-09 23:54:59 +01:00
Łukasz Magiera
62ed17f6e4 Update Network stack floppy 2014-12-09 23:06:58 +01:00
Florian Nücke
df86ebdf38 Added flash.lua program to make programming EEPROMs a little more comfortable. 2014-12-09 13:49:33 +01:00
Florian Nücke
3e1af107cc Hmm, don't know something actually changed since I saved earlier... oh well. 2014-12-09 00:38:12 +01:00
Florian Nücke
e585b13b10 Made file systems count as 1/4th component instead of being completely free. Just to avoid unhealthy numbers of raids/disk drives being connected to one computer. 2014-12-08 23:37:28 +01:00
Florian Nücke
e37bf65f3f Cables shouldn't connect to the front of MCUs. Because I say so. 2014-12-08 23:26:53 +01:00
Florian Nücke
57548d30de Hiding microcontroller block from creative tab and NEI (given one makes no sense since it has no components in it). 2014-12-08 23:15:19 +01:00
Florian Nücke
c3234b65b4 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-12-08 22:24:35 +01:00
Florian Nücke
6168825043 Added line to network boot script as requested by Magik6k. 2014-12-08 22:23:55 +01:00
Florian Nücke
5635fe3e88 Disabling RE integration for now, as it's officially unstable/in-dev. 2014-12-08 22:21:34 +01:00